Commit 792c4c23 authored by unknown's avatar unknown

fixes for some compile problems on some platforms


ndb/src/mgmsrv/MgmtSrvr.cpp:
  atoll missing on some platforms
ndb/src/ndbapi/NdbScanOperation.cpp:
  compile error on some platforms
ndb/test/ndbapi/testIndex.cpp:
  Added some explicit templates
ndb/test/ndbapi/testNdbApi.cpp:
  Added some explicit templates
ndb/test/ndbapi/testRestartGci.cpp:
  Added some explicit templates
ndb/test/ndbapi/testScan.cpp:
  Added some explicit templates
ndb/test/run-test/main.cpp:
  Added some explicit templates
ndb/test/src/HugoOperations.cpp:
  Added some explicit templates
ndb/test/tools/cpcc.cpp:
  Added some explicit templates
parent 883bda5d
...@@ -2835,7 +2835,7 @@ MgmtSrvr::setDbParameter(int node, int param, const char * value, ...@@ -2835,7 +2835,7 @@ MgmtSrvr::setDbParameter(int node, int param, const char * value,
p_type++; p_type++;
if(iter.get(param, &val_64) == 0){ if(iter.get(param, &val_64) == 0){
val_64 = atoll(value); val_64 = strtoll(value, 0, 10);
break; break;
} }
p_type++; p_type++;
......
...@@ -661,8 +661,6 @@ NdbScanOperation::doSend(int ProcessorId) ...@@ -661,8 +661,6 @@ NdbScanOperation::doSend(int ProcessorId)
void NdbScanOperation::closeScan() void NdbScanOperation::closeScan()
{ {
int self = pthread_self() ;
if(m_transConnection) do { if(m_transConnection) do {
if(DEBUG_NEXT_RESULT) if(DEBUG_NEXT_RESULT)
ndbout_c("closeScan() theError.code = %d " ndbout_c("closeScan() theError.code = %d "
......
...@@ -1529,4 +1529,4 @@ int main(int argc, const char** argv){ ...@@ -1529,4 +1529,4 @@ int main(int argc, const char** argv){
return testIndex.execute(argc, argv); return testIndex.execute(argc, argv);
} }
template class Vector<Attrib*>;
...@@ -1010,4 +1010,5 @@ int main(int argc, const char** argv){ ...@@ -1010,4 +1010,5 @@ int main(int argc, const char** argv){
return testNdbApi.execute(argc, argv); return testNdbApi.execute(argc, argv);
} }
template class Vector<Ndb*>;
template class Vector<NdbConnection*>;
...@@ -216,3 +216,5 @@ NDBT_TESTSUITE_END(testRestartGci); ...@@ -216,3 +216,5 @@ NDBT_TESTSUITE_END(testRestartGci);
int main(int argc, const char** argv){ int main(int argc, const char** argv){
return testRestartGci.execute(argc, argv); return testRestartGci.execute(argc, argv);
} }
template class Vector<SavedRecord>;
...@@ -1404,3 +1404,4 @@ int main(int argc, const char** argv){ ...@@ -1404,3 +1404,4 @@ int main(int argc, const char** argv){
return testScan.execute(argc, argv); return testScan.execute(argc, argv);
} }
template class Vector<Attrib*>;
...@@ -988,3 +988,7 @@ setup_hosts(atrt_config& config){ ...@@ -988,3 +988,7 @@ setup_hosts(atrt_config& config){
} }
template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>; template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;
template class Vector<SimpleCpcClient::Process>;
template class Vector<Vector<SimpleCpcClient::Process> >;
template class Vector<atrt_host>;
template class Vector<atrt_process>;
...@@ -796,3 +796,5 @@ HugoOperations::scanReadRecords(Ndb* pNdb, NdbScanOperation::LockMode lm, ...@@ -796,3 +796,5 @@ HugoOperations::scanReadRecords(Ndb* pNdb, NdbScanOperation::LockMode lm,
return 0; return 0;
} }
template class Vector<HugoOperations::RsPair>;
...@@ -348,3 +348,5 @@ Operate::evaluate(SimpleCpcClient* c, const SimpleCpcClient::Process & pp){ ...@@ -348,3 +348,5 @@ Operate::evaluate(SimpleCpcClient* c, const SimpleCpcClient::Process & pp){
} }
template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>; template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;
template class Vector<Expression*>;
template class Vector<SimpleCpcClient*>;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment