Commit b773b567 authored by unknown's avatar unknown

These test program also uses old way to create tables, thus requires NdbSchemaCon.hpp


ndb/test/ndbapi/flexHammer/flexHammer.cpp:
  This test program also uses old way to create tables, thus requires NdbSchemaCon.hpp
ndb/test/ndbapi/flexTT/flexTT.cpp:
  This test program also uses old way to create tables, thus requires NdbSchemaCon.hpp
ndb/test/src/NDBT_ResultRow.cpp:
  Correct spelling errors in comment's.
parent af81ff81
...@@ -58,6 +58,7 @@ Revision history: ...@@ -58,6 +58,7 @@ Revision history:
#include <NdbTick.h> #include <NdbTick.h>
#include <NdbTest.hpp> #include <NdbTest.hpp>
#include <NDBT_Error.hpp> #include <NDBT_Error.hpp>
#include <NdbSchemaCon.hpp>
ErrorData * flexHammerErrorData; ErrorData * flexHammerErrorData;
...@@ -754,7 +755,7 @@ createTables(Ndb* pMyNdb) ...@@ -754,7 +755,7 @@ createTables(Ndb* pMyNdb)
} // if } // if
ndbout << endl; ndbout << endl;
MySchemaTransaction = pMyNdb->startSchemaTransaction(); MySchemaTransaction = NdbSchemaCon::startSchemaTrans(pMyNdb);
if (MySchemaTransaction == NULL) { if (MySchemaTransaction == NULL) {
return(-1); return(-1);
} // if } // if
...@@ -762,7 +763,7 @@ createTables(Ndb* pMyNdb) ...@@ -762,7 +763,7 @@ createTables(Ndb* pMyNdb)
MySchemaOp = MySchemaTransaction->getNdbSchemaOp(); MySchemaOp = MySchemaTransaction->getNdbSchemaOp();
if (MySchemaOp == NULL) { if (MySchemaOp == NULL) {
// Clean up opened schema transaction // Clean up opened schema transaction
pMyNdb->closeSchemaTransaction(MySchemaTransaction); NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
return(-1); return(-1);
} // if } // if
...@@ -787,7 +788,7 @@ createTables(Ndb* pMyNdb) ...@@ -787,7 +788,7 @@ createTables(Ndb* pMyNdb)
#endif #endif
if (check == -1) { if (check == -1) {
// Clean up opened schema transaction // Clean up opened schema transaction
pMyNdb->closeSchemaTransaction(MySchemaTransaction); NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
return(-1); return(-1);
} // if } // if
...@@ -798,7 +799,7 @@ createTables(Ndb* pMyNdb) ...@@ -798,7 +799,7 @@ createTables(Ndb* pMyNdb)
NotNullAttribute ); NotNullAttribute );
if (check == -1) { if (check == -1) {
// Clean up opened schema transaction // Clean up opened schema transaction
pMyNdb->closeSchemaTransaction(MySchemaTransaction); NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
return(-1); return(-1);
} // if } // if
...@@ -810,7 +811,7 @@ createTables(Ndb* pMyNdb) ...@@ -810,7 +811,7 @@ createTables(Ndb* pMyNdb)
NotNullAttribute ); NotNullAttribute );
if (check == -1) { if (check == -1) {
// Clean up opened schema transaction // Clean up opened schema transaction
pMyNdb->closeSchemaTransaction(MySchemaTransaction); NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
return(-1); return(-1);
} // if } // if
} // for } // for
...@@ -819,11 +820,11 @@ createTables(Ndb* pMyNdb) ...@@ -819,11 +820,11 @@ createTables(Ndb* pMyNdb)
check = MySchemaTransaction->execute(); check = MySchemaTransaction->execute();
if (check == -1) { if (check == -1) {
// Clean up opened schema transaction // Clean up opened schema transaction
pMyNdb->closeSchemaTransaction(MySchemaTransaction); NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
return(-1); return(-1);
} // if } // if
pMyNdb->closeSchemaTransaction(MySchemaTransaction); NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
} // for } // for
} // if } // if
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <ndb_global.h> #include <ndb_global.h>
#include <NdbApi.hpp> #include <NdbApi.hpp>
#include <NdbSchemaCon.hpp>
#include <NdbMain.h> #include <NdbMain.h>
#include <md5_hash.hpp> #include <md5_hash.hpp>
...@@ -662,7 +663,7 @@ createTables(Ndb* pMyNdb){ ...@@ -662,7 +663,7 @@ createTables(Ndb* pMyNdb){
if (theTableCreateFlag == 0) { if (theTableCreateFlag == 0) {
ndbout << "Creating Table: vpn_users " << "..." << endl; ndbout << "Creating Table: vpn_users " << "..." << endl;
MySchemaTransaction = pMyNdb->startSchemaTransaction(); MySchemaTransaction = NdbSchemaCon::startSchemaTrans(pMyNdb);
if(MySchemaTransaction == NULL && if(MySchemaTransaction == NULL &&
(!error_handler(MySchemaTransaction->getNdbError()))) (!error_handler(MySchemaTransaction->getNdbError())))
...@@ -748,7 +749,7 @@ createTables(Ndb* pMyNdb){ ...@@ -748,7 +749,7 @@ createTables(Ndb* pMyNdb){
(!error_handler(MySchemaTransaction->getNdbError()))) (!error_handler(MySchemaTransaction->getNdbError())))
return -1; return -1;
pMyNdb->closeSchemaTransaction(MySchemaTransaction); NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
}//if }//if
return 0; return 0;
......
...@@ -112,7 +112,7 @@ BaseString NDBT_ResultRow::c_str() { ...@@ -112,7 +112,7 @@ BaseString NDBT_ResultRow::c_str() {
/** /**
* TODO This could chare the sanme printer function as in * TODO This should share the same printer function as in
* NdbEventOperationImpl.cpp, using new types of course :) * NdbEventOperationImpl.cpp, using new types of course :)
*/ */
......
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