From cd3b9f5790aafc0479d73f20a8ae9af2bc8cf89a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Jan 2005 19:45:57 +0100 Subject: [PATCH] ndb compile warnings ndb/test/include/NDBT_Test.hpp: compile warnings ndb/test/ndbapi/bank/BankLoad.cpp: compile warnings ndb/test/ndbapi/testOIBasic.cpp: compile warnings ndb/test/src/HugoCalculator.cpp: compile warnings ndb/test/src/NDBT_Test.cpp: compile warnings ndb/test/src/NdbBackup.cpp: compile warnings ndb/test/src/NdbRestarts.cpp: compile warnings --- ndb/test/include/NDBT_Test.hpp | 2 +- ndb/test/ndbapi/bank/BankLoad.cpp | 4 ++-- ndb/test/ndbapi/testOIBasic.cpp | 10 +++++----- ndb/test/src/HugoCalculator.cpp | 8 +++----- ndb/test/src/NDBT_Test.cpp | 3 +-- ndb/test/src/NdbBackup.cpp | 2 +- ndb/test/src/NdbRestarts.cpp | 30 +++++++++++++++--------------- 7 files changed, 28 insertions(+), 31 deletions(-) diff --git a/ndb/test/include/NDBT_Test.hpp b/ndb/test/include/NDBT_Test.hpp index 53f75db723f..f9fbb6b186d 100644 --- a/ndb/test/include/NDBT_Test.hpp +++ b/ndb/test/include/NDBT_Test.hpp @@ -429,7 +429,7 @@ C##suitname():NDBT_TestSuite(#suitname){ \ pt->addTable(tableName, false); #define NDBT_TESTSUITE_END(suitname) \ - } } ; C##suitname suitname; + } } ; C##suitname suitname // Helper functions for retrieving variables from NDBT_Step #define GETNDB(ps) ((NDBT_NdbApiStep*)ps)->getNdb() diff --git a/ndb/test/ndbapi/bank/BankLoad.cpp b/ndb/test/ndbapi/bank/BankLoad.cpp index 0df9b43ae07..34947019a51 100644 --- a/ndb/test/ndbapi/bank/BankLoad.cpp +++ b/ndb/test/ndbapi/bank/BankLoad.cpp @@ -321,7 +321,7 @@ int Bank::loadGl(){ m_ndb.closeTransaction(pTrans); return NDBT_OK; -}; +} int Bank::getBalanceForAccountType(const Uint32 accountType, @@ -459,7 +459,7 @@ int Bank::loadAccountType(){ m_ndb.closeTransaction(pTrans); return NDBT_OK; -}; +} /** * Load ACCOUNT table diff --git a/ndb/test/ndbapi/testOIBasic.cpp b/ndb/test/ndbapi/testOIBasic.cpp index 0f31a30f1a7..33482bd9b11 100644 --- a/ndb/test/ndbapi/testOIBasic.cpp +++ b/ndb/test/ndbapi/testOIBasic.cpp @@ -3127,7 +3127,7 @@ pkinsert(Par par) } con.closeTransaction(); return 0; -}; +} static int pkupdate(Par par) @@ -3183,7 +3183,7 @@ pkupdate(Par par) } con.closeTransaction(); return 0; -}; +} static int pkdelete(Par par) @@ -3235,7 +3235,7 @@ pkdelete(Par par) } con.closeTransaction(); return 0; -}; +} static int pkread(Par par) @@ -3349,7 +3349,7 @@ hashindexupdate(Par par, const ITab& itab) } con.closeTransaction(); return 0; -}; +} static int hashindexdelete(Par par, const ITab& itab) @@ -3400,7 +3400,7 @@ hashindexdelete(Par par, const ITab& itab) } con.closeTransaction(); return 0; -}; +} static int hashindexread(Par par, const ITab& itab) diff --git a/ndb/test/src/HugoCalculator.cpp b/ndb/test/src/HugoCalculator.cpp index 20bcc445541..675d0ac786a 100644 --- a/ndb/test/src/HugoCalculator.cpp +++ b/ndb/test/src/HugoCalculator.cpp @@ -52,7 +52,7 @@ HugoCalculator::HugoCalculator(const NdbDictionary::Table& tab) : m_tab(tab) { #endif // Check that idCol is not conflicting with updatesCol assert(m_idCol != m_updatesCol && m_idCol != -1 && m_updatesCol != -1); -}; +} Int32 HugoCalculator::calcValue(int record, @@ -74,7 +74,7 @@ HugoCalculator::calcValue(int record, else val = record + attrib + updates; return val; -}; +} #if 0 HugoCalculator::U_Int32 calcValue(int record, int attrib, int updates) const; HugoCalculator::U_Int64 calcValue(int record, int attrib, int updates) const; @@ -109,8 +109,6 @@ HugoCalculator::calcValue(int record, // Calculate length of the string to create. We want the string // length to be varied between max and min of this attribute. - Uint32 org = len; - if(attr->getType() == NdbDictionary::Column::Varchar) len = val % (len + 1); else @@ -137,7 +135,7 @@ HugoCalculator::calcValue(int record, } } return buf; -}; +} int HugoCalculator::verifyRowValues(NDBT_ResultRow* const pRow) const{ diff --git a/ndb/test/src/NDBT_Test.cpp b/ndb/test/src/NDBT_Test.cpp index 45ee172811a..0e45572ca3b 100644 --- a/ndb/test/src/NDBT_Test.cpp +++ b/ndb/test/src/NDBT_Test.cpp @@ -617,8 +617,7 @@ int NDBT_TestCase::execute(NDBT_Context* ctx){ << endl; } return res; -}; - +} void NDBT_TestCase::startTimer(NDBT_Context* ctx){ timer.doStart(); diff --git a/ndb/test/src/NdbBackup.cpp b/ndb/test/src/NdbBackup.cpp index 5e22468692e..bc5baeae4b5 100644 --- a/ndb/test/src/NdbBackup.cpp +++ b/ndb/test/src/NdbBackup.cpp @@ -336,7 +336,7 @@ NdbBackup::NF(NdbRestarter& _restarter, int *NFDuringBackup_codes, const int sz, } return NDBT_OK; -}; +} int FailS_codes[] = { diff --git a/ndb/test/src/NdbRestarts.cpp b/ndb/test/src/NdbRestarts.cpp index 607e48c4126..c0f31af84ce 100644 --- a/ndb/test/src/NdbRestarts.cpp +++ b/ndb/test/src/NdbRestarts.cpp @@ -213,7 +213,7 @@ NdbRestarts::NdbRestart::NdbRestart(const char* _name, m_restartFunc = _func; m_numRequiredNodes = _requiredNodes; // m_arg1 = arg1; -}; +} int NdbRestarts::getNumRestarts(){ @@ -367,7 +367,7 @@ int restartRandomNodeGraceful(NdbRestarter& _restarter, "Could not restart node "<m_name << endl; return NDBT_OK; -}; +} int NFDuringNR_codes[] = { @@ -713,7 +713,7 @@ int restartNFDuringNR(NdbRestarter& _restarter, } return NDBT_OK; -}; +} int NRDuringLCP_Master_codes[] = { @@ -864,7 +864,7 @@ int stopOnError(NdbRestarter& _restarter, } while (false); return NDBT_OK; -}; +} int getRandomNodeId(NdbRestarter& _restarter) { myRandom48Init(NdbTick_CurrentMillisecond());