Skip to content

Commit 02b123d

Browse files
author
Magnus Svensson
committed
Bug#40549 Use of non-standard C++ syntax should be removed from the code
- Fix for 6.2
1 parent 6678181 commit 02b123d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

BUILD/SETUP.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ prefix="/usr/local/mysql"
6161
just_print=
6262
just_configure=
6363
full_debug=
64-
warning_mode=
64+
warning_mode="pedantic"
6565

6666
parse_options "$@"
6767

storage/ndb/src/kernel/blocks/suma/Suma.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class Suma : public SimulatedBlock {
200200
R_SUB_STOP_REQ,
201201
R_START_ME_REQ,
202202
R_API_FAIL_REQ,
203-
R_SUB_ABORT_START_REQ,
203+
R_SUB_ABORT_START_REQ
204204
};
205205

206206
Uint32 m_opType;

storage/ndb/src/ndbapi/NdbInterpretedCode.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ NdbInterpretedCode::ret_sub()
836836
m_flags&= ~(InSubroutineDef);
837837

838838
return add1(Interpreter::RETURN);
839-
};
839+
}
840840

841841
/* Get a CodeMetaInfo object given a number
842842
* Label numbers start from 0. Subroutine numbers start from

storage/ndb/src/ndbapi/NdbScanOperation.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ NdbScanOperation::addInterpretedCode(Uint32 aTC_ConnectPtr,
227227
theAI_LenInCurrAI= theCurrentATTRINFO->getLength();
228228

229229
return res;
230-
};
230+
}
231231

232232
/* Method for handling scanoptions passed into
233233
* NdbTransaction::scanTable or scanIndex
@@ -969,7 +969,7 @@ NdbScanOperation::readTuples(NdbScanOperation::LockMode lm,
969969
m_savedBatchOldApi= batch;
970970

971971
return 0;
972-
};
972+
}
973973

974974
/* Most of the scan definition work for old + NdbRecord API scans is done here */
975975
int
@@ -1350,7 +1350,7 @@ NdbScanOperation::nextResult(bool fetchAllowed, bool forceSend)
13501350
return nextResult(&dummyOutRowPtr,
13511351
fetchAllowed,
13521352
forceSend);
1353-
};
1353+
}
13541354

13551355
/* nextResult() for NdbRecord operation. */
13561356
int

0 commit comments

Comments
 (0)