Fix bank

ndb/test/ndbapi/Makefile.am

@@ -9,7 +9,6 @@ create_tab \
 flexAsynch \
 flexBench \
 flexHammer \
-flexScan \
 flexTT \
 testBackup \
 testBasic \
@@ -40,7 +39,6 @@ drop_all_tabs_SOURCES = drop_all_tabs.cpp
 flexAsynch_SOURCES = flexAsynch.cpp
 flexBench_SOURCES = flexBench.cpp
 flexHammer_SOURCES = flexHammer.cpp
-flexScan_SOURCES = flexScan.cpp
 flexTT_SOURCES = flexTT.cpp
 #flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
 #flex_bench_mysql_SOURCES = flex_bench_mysql.cpp

ndb/test/ndbapi/bank/BankLoad.cpp

@@ -335,15 +335,15 @@ int Bank::getBalanceForAccountType(const Uint32 accountType,
     return NDBT_FAILED;
   }
       
-  NdbOperation* pOp = pScanTrans->getNdbOperation("ACCOUNT");	
+  NdbScanOperation* pOp = pScanTrans->getNdbScanOperation("ACCOUNT");	
   if (pOp == NULL) {
     ERR(pScanTrans->getNdbError());
     m_ndb.closeTransaction(pScanTrans);
     return NDBT_FAILED;
   }
 
-  check = pOp->openScanRead(64);
-  if( check == -1 ) {
+  NdbResultSet* rs = pOp->readTuples();
+  if( rs == 0 ) {
     ERR(pScanTrans->getNdbError());
     m_ndb.closeTransaction(pScanTrans);
     return NDBT_FAILED;
@@ -370,7 +370,7 @@ int Bank::getBalanceForAccountType(const Uint32 accountType,
     return NDBT_FAILED;
   }
 
-  check = pScanTrans->executeScan();   
+  check = pScanTrans->execute(NoCommit);
   if( check == -1 ) {
     ERR(pScanTrans->getNdbError());
     m_ndb.closeTransaction(pScanTrans);
@@ -379,7 +379,7 @@ int Bank::getBalanceForAccountType(const Uint32 accountType,
     
   int eof;
   int rows = 0;
-  eof = pScanTrans->nextScanResult();
+  eof = rs->nextResult();
     
   while(eof == 0){
     rows++;
@@ -391,7 +391,7 @@ int Bank::getBalanceForAccountType(const Uint32 accountType,
       balance += b;
     }
 		
-    eof = pScanTrans->nextScanResult();
+    eof = rs->nextResult();
   }
   if (eof == -1) {
     ERR(pScanTrans->getNdbError());

ndb/test/ndbapi/testBackup.cpp

@@ -205,8 +205,6 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){
   return NDBT_OK;
 }
 
-#if 0
-
 #include "bank/Bank.hpp"
 
 int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
@@ -395,7 +393,6 @@ int runRestoreBankAndVerify(NDBT_Context* ctx, NDBT_Step* step){
   
   return result;
 }
-#endif
 
 NDBT_TESTSUITE(testBackup);
 TESTCASE("BackupOne", 
@@ -413,7 +410,6 @@ TESTCASE("BackupOne",
   FINALIZER(runClearTable);
 
 }
-#if 0
 TESTCASE("BackupBank", 
 	 "Test that backup and restore works during transaction load\n"
 	 " by backing up the bank"
@@ -433,7 +429,6 @@ TESTCASE("BackupBank",
   VERIFIER(runRestoreBankAndVerify);
   //  FINALIZER(runDropBank);
 }
-#endif
 TESTCASE("NFMaster", 
 	 "Test that backup behaves during node failiure\n"){
   INITIALIZER(setMaster);

ndb/test/ndbapi/testGrep.cpp

@@ -254,9 +254,7 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){
   return NDBT_OK;
 }
 
-#if 0
-
-#include "../bank/Bank.hpp"
+#include "bank/Bank.hpp"
 
 int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
   Bank bank;
@@ -445,7 +443,6 @@ int runRestoreBankAndVerify(NDBT_Context* ctx, NDBT_Step* step){
   return result;
 }
 */
-#endif
 
 NDBT_TESTSUITE(testGrep);
 TESTCASE("GrepBasic", 
@@ -476,8 +473,6 @@ TESTCASE("GrepNodeRestart",
 }
 
 
-#if 0
-
 TESTCASE("GrepBank", 
 	 "Test that grep and restore works during transaction load\n"
 	 " by backing up the bank"
@@ -498,7 +493,6 @@ TESTCASE("GrepBank",
   //  FINALIZER(runDropBank);
 
 }
-#endif
 
 TESTCASE("NFMaster", 
 	 "Test that grep behaves during node failiure\n"){