database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity

ndb compile warnings

Browse Source 
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
This commit is contained in:
unknown
2005-01-11 19:45:57 +01:00
parent 53e0c172da
commit cd3b9f5790
7 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/test/include/NDBT_Test.hpp
View File

@@ -429,7 +429,7 @@ C##suitname():NDBT_TestSuite(#suitname){ \
pt->addTable(tableName, false); pt->addTable(tableName, false);
#define NDBT_TESTSUITE_END(suitname) \ #define NDBT_TESTSUITE_END(suitname) \
} } ; C##suitname suitname; } } ; C##suitname suitname
// Helper functions for retrieving variables from NDBT_Step // Helper functions for retrieving variables from NDBT_Step
#define GETNDB(ps) ((NDBT_NdbApiStep*)ps)->getNdb() #define GETNDB(ps) ((NDBT_NdbApiStep*)ps)->getNdb()

4
ndb/test/ndbapi/bank/BankLoad.cpp
View File

@@ -321,7 +321,7 @@ int Bank::loadGl(){
m_ndb.closeTransaction(pTrans); m_ndb.closeTransaction(pTrans);
return NDBT_OK; return NDBT_OK;
}; }
int Bank::getBalanceForAccountType(const Uint32 accountType, int Bank::getBalanceForAccountType(const Uint32 accountType,
@@ -459,7 +459,7 @@ int Bank::loadAccountType(){
m_ndb.closeTransaction(pTrans); m_ndb.closeTransaction(pTrans);
return NDBT_OK; return NDBT_OK;
}; }
/** /**
* Load ACCOUNT table * Load ACCOUNT table

10
ndb/test/ndbapi/testOIBasic.cpp
View File

@@ -3127,7 +3127,7 @@ pkinsert(Par par)
} }
con.closeTransaction(); con.closeTransaction();
return 0; return 0;
}; }
static int static int
pkupdate(Par par) pkupdate(Par par)
@@ -3183,7 +3183,7 @@ pkupdate(Par par)
} }
con.closeTransaction(); con.closeTransaction();
return 0; return 0;
}; }
static int static int
pkdelete(Par par) pkdelete(Par par)
@@ -3235,7 +3235,7 @@ pkdelete(Par par)
} }
con.closeTransaction(); con.closeTransaction();
return 0; return 0;
}; }
static int static int
pkread(Par par) pkread(Par par)
@@ -3349,7 +3349,7 @@ hashindexupdate(Par par, const ITab& itab)
} }
con.closeTransaction(); con.closeTransaction();
return 0; return 0;
}; }
static int static int
hashindexdelete(Par par, const ITab& itab) hashindexdelete(Par par, const ITab& itab)
@@ -3400,7 +3400,7 @@ hashindexdelete(Par par, const ITab& itab)
} }
con.closeTransaction(); con.closeTransaction();
return 0; return 0;
}; }
static int static int
hashindexread(Par par, const ITab& itab) hashindexread(Par par, const ITab& itab)

8
ndb/test/src/HugoCalculator.cpp
View File

@@ -52,7 +52,7 @@ HugoCalculator::HugoCalculator(const NdbDictionary::Table& tab) : m_tab(tab) {
#endif #endif
// Check that idCol is not conflicting with updatesCol // Check that idCol is not conflicting with updatesCol
assert(m_idCol != m_updatesCol && m_idCol != -1 && m_updatesCol != -1); assert(m_idCol != m_updatesCol && m_idCol != -1 && m_updatesCol != -1);
}; }
Int32 Int32
HugoCalculator::calcValue(int record, HugoCalculator::calcValue(int record,
@@ -74,7 +74,7 @@ HugoCalculator::calcValue(int record,
else else
val = record + attrib + updates; val = record + attrib + updates;
return val; return val;
}; }
#if 0 #if 0
HugoCalculator::U_Int32 calcValue(int record, int attrib, int updates) const; HugoCalculator::U_Int32 calcValue(int record, int attrib, int updates) const;
HugoCalculator::U_Int64 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 // Calculate length of the string to create. We want the string
// length to be varied between max and min of this attribute. // length to be varied between max and min of this attribute.
Uint32 org = len;
if(attr->getType() == NdbDictionary::Column::Varchar) if(attr->getType() == NdbDictionary::Column::Varchar)
len = val % (len + 1); len = val % (len + 1);
else else
@@ -137,7 +135,7 @@ HugoCalculator::calcValue(int record,
} }
} }
return buf; return buf;
}; }
int int
HugoCalculator::verifyRowValues(NDBT_ResultRow* const pRow) const{ HugoCalculator::verifyRowValues(NDBT_ResultRow* const pRow) const{

3
ndb/test/src/NDBT_Test.cpp
View File

@@ -617,8 +617,7 @@ int NDBT_TestCase::execute(NDBT_Context* ctx){
<< endl; << endl;
} }
return res; return res;
}; }
void NDBT_TestCase::startTimer(NDBT_Context* ctx){ void NDBT_TestCase::startTimer(NDBT_Context* ctx){
timer.doStart(); timer.doStart();

2
ndb/test/src/NdbBackup.cpp
View File

@@ -336,7 +336,7 @@ NdbBackup::NF(NdbRestarter& _restarter, int *NFDuringBackup_codes, const int sz,
} }
return NDBT_OK; return NDBT_OK;
}; }
int int
FailS_codes[] = { FailS_codes[] = {

30
ndb/test/src/NdbRestarts.cpp
View File

@@ -213,7 +213,7 @@ NdbRestarts::NdbRestart::NdbRestart(const char* _name,
m_restartFunc = _func; m_restartFunc = _func;
m_numRequiredNodes = _requiredNodes; m_numRequiredNodes = _requiredNodes;
// m_arg1 = arg1; // m_arg1 = arg1;
}; }
int NdbRestarts::getNumRestarts(){ int NdbRestarts::getNumRestarts(){
@@ -367,7 +367,7 @@ int restartRandomNodeGraceful(NdbRestarter& _restarter,
"Could not restart node "<<nodeId); "Could not restart node "<<nodeId);
return NDBT_OK; return NDBT_OK;
}; }
int restartRandomNodeAbort(NdbRestarter& _restarter, int restartRandomNodeAbort(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -382,7 +382,7 @@ int restartRandomNodeAbort(NdbRestarter& _restarter,
"Could not restart node "<<nodeId); "Could not restart node "<<nodeId);
return NDBT_OK; return NDBT_OK;
}; }
int restartRandomNodeError(NdbRestarter& _restarter, int restartRandomNodeError(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -397,7 +397,7 @@ int restartRandomNodeError(NdbRestarter& _restarter,
"Could not restart node "<<nodeId); "Could not restart node "<<nodeId);
return NDBT_OK; return NDBT_OK;
}; }
int restartMasterNodeError(NdbRestarter& _restarter, int restartMasterNodeError(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -410,7 +410,7 @@ int restartMasterNodeError(NdbRestarter& _restarter,
"Could not restart node "<<nodeId); "Could not restart node "<<nodeId);
return NDBT_OK; return NDBT_OK;
}; }
int restartRandomNodeInitial(NdbRestarter& _restarter, int restartRandomNodeInitial(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -425,7 +425,7 @@ int restartRandomNodeInitial(NdbRestarter& _restarter,
"Could not restart node "<<nodeId); "Could not restart node "<<nodeId);
return NDBT_OK; return NDBT_OK;
}; }
int twoNodeFailure(NdbRestarter& _restarter, int twoNodeFailure(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -453,7 +453,7 @@ int twoNodeFailure(NdbRestarter& _restarter,
"Could not restart node "<< nodeId); "Could not restart node "<< nodeId);
return NDBT_OK; return NDBT_OK;
}; }
int twoMasterNodeFailure(NdbRestarter& _restarter, int twoMasterNodeFailure(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -478,7 +478,7 @@ int twoMasterNodeFailure(NdbRestarter& _restarter,
"Could not restart node "<< nodeId); "Could not restart node "<< nodeId);
return NDBT_OK; return NDBT_OK;
}; }
int get50PercentOfNodes(NdbRestarter& restarter, int get50PercentOfNodes(NdbRestarter& restarter,
int * _nodes){ int * _nodes){
@@ -519,7 +519,7 @@ int fiftyPercentFail(NdbRestarter& _restarter,
"Could not start all nodes"); "Could not start all nodes");
return NDBT_OK; return NDBT_OK;
}; }
int restartAllNodesGracfeul(NdbRestarter& _restarter, int restartAllNodesGracfeul(NdbRestarter& _restarter,
@@ -533,7 +533,7 @@ int restartAllNodesGracfeul(NdbRestarter& _restarter,
return NDBT_OK; return NDBT_OK;
}; }
int restartAllNodesAbort(NdbRestarter& _restarter, int restartAllNodesAbort(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -545,7 +545,7 @@ int restartAllNodesAbort(NdbRestarter& _restarter,
"Could not restart all nodes"); "Could not restart all nodes");
return NDBT_OK; return NDBT_OK;
}; }
int restartAllNodesError9999(NdbRestarter& _restarter, int restartAllNodesError9999(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -557,7 +557,7 @@ int restartAllNodesError9999(NdbRestarter& _restarter,
"Could not restart all nodes "); "Could not restart all nodes ");
return NDBT_OK; return NDBT_OK;
}; }
int fiftyPercentStopAndWait(NdbRestarter& _restarter, int fiftyPercentStopAndWait(NdbRestarter& _restarter,
const NdbRestarts::NdbRestart* _restart){ const NdbRestarts::NdbRestart* _restart){
@@ -590,7 +590,7 @@ int fiftyPercentStopAndWait(NdbRestarter& _restarter,
g_info << _restart->m_name << endl; g_info << _restart->m_name << endl;
return NDBT_OK; return NDBT_OK;
}; }
int int
NFDuringNR_codes[] = { NFDuringNR_codes[] = {
@@ -713,7 +713,7 @@ int restartNFDuringNR(NdbRestarter& _restarter,
} }
return NDBT_OK; return NDBT_OK;
}; }
int int
NRDuringLCP_Master_codes[] = { NRDuringLCP_Master_codes[] = {
@@ -864,7 +864,7 @@ int stopOnError(NdbRestarter& _restarter,
} while (false); } while (false);
return NDBT_OK; return NDBT_OK;
}; }
int getRandomNodeId(NdbRestarter& _restarter) { int getRandomNodeId(NdbRestarter& _restarter) {
myRandom48Init(NdbTick_CurrentMillisecond()); myRandom48Init(NdbTick_CurrentMillisecond());