Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into mysql.com:/home/jonas/src/mysql-5.0-ndb

ndb/test/include/NDBT_Test.hpp

@@ -25,6 +25,7 @@
 #include <NdbCondition.h>
 #include <NdbTimer.hpp>
 #include <Vector.hpp>
+#include <NdbApi.hpp>
 #include <NdbDictionary.hpp>
 
 class NDBT_Step;
@@ -34,7 +35,9 @@ class NDBT_TestCaseImpl1;
 
 class NDBT_Context {
 public:
-  NDBT_Context();
+  Ndb_cluster_connection& m_cluster_connection;
+  
+  NDBT_Context(Ndb_cluster_connection&);
   ~NDBT_Context();
   const NdbDictionary::Table* getTab();
   NDBT_TestSuite* getSuite();
@@ -120,7 +123,7 @@ public:
 		NDBT_TESTFUNC* pfunc);
   virtual ~NDBT_Step() {}
   int execute(NDBT_Context*);
-  virtual int setUp() = 0;
+  virtual int setUp(Ndb_cluster_connection&) = 0;
   virtual void tearDown() = 0;
   void setContext(NDBT_Context*);
   NDBT_Context* getContext();
@@ -142,7 +145,7 @@ public:
 		  const char* pname,
 		  NDBT_TESTFUNC* pfunc);
   virtual ~NDBT_NdbApiStep() {}
-  virtual int setUp();
+  virtual int setUp(Ndb_cluster_connection&);
   virtual void tearDown();
 
   Ndb* getNdb();
@@ -347,10 +350,13 @@ public:
 
   int addTest(NDBT_TestCase* pTest);
 private:
-  int executeOne(const char* _tabname, const char* testname = NULL);
-  int executeAll(const char* testname = NULL);
+  int executeOne(Ndb_cluster_connection&,
+		 const char* _tabname, const char* testname = NULL);
+  int executeAll(Ndb_cluster_connection&,
+		 const char* testname = NULL);
+  void execute(Ndb_cluster_connection&,
+	       Ndb*, const NdbDictionary::Table*, const char* testname = NULL);
   
-  void execute(Ndb*, const NdbDictionary::Table*, const char* testname = NULL);
   int report(const char* _tcname = NULL);
   int reportAllTables(const char* );
   const char* name;

ndb/test/ndbapi/bank/Bank.cpp

@@ -19,8 +19,8 @@
 #include <NdbSleep.h>
 #include <UtilTransactions.hpp>
 
-Bank::Bank():
-  m_ndb("BANK"),
+Bank::Bank(Ndb_cluster_connection& con):
+  m_ndb(&con, "BANK"),
   m_maxAccount(-1),
   m_initialized(false)
 {

ndb/test/ndbapi/bank/Bank.hpp

@@ -27,7 +27,7 @@
 class Bank {
 public:  
 
-  Bank();
+  Bank(Ndb_cluster_connection&);
 
   int createAndLoadBank(bool overWrite, int num_accounts=10);
   int dropBank();

ndb/test/ndbapi/bank/bankCreator.cpp

@@ -43,7 +43,13 @@ int main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Bank bank;
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  Bank bank(con);
   int overWriteExisting = true;
   if (bank.createAndLoadBank(overWriteExisting) != NDBT_OK)
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/ndbapi/bank/bankMakeGL.cpp

@@ -43,7 +43,13 @@ int main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Bank bank;
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  Bank bank(con);
 
   if (bank.performMakeGLs() != 0)
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/ndbapi/bank/bankSumAccounts.cpp

@@ -43,7 +43,13 @@ int main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Bank bank;
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  Bank bank(con);
 
   if (bank.performSumAccounts() != 0)
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/ndbapi/bank/bankTimer.cpp

@@ -46,7 +46,13 @@ int main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Bank bank;
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  Bank bank(con);
 
   if (bank.performIncreaseTime(_wait) != 0)
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/ndbapi/bank/bankTransactionMaker.cpp

@@ -46,7 +46,13 @@ int main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Bank bank;
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  Bank bank(con);
 
   if (bank.performTransactions(_wait) != 0)
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/ndbapi/bank/bankValidateAllGLs.cpp

@@ -44,7 +44,13 @@ int main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Bank bank;
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  Bank bank(con);
 
   if (bank.performValidateAllGLs() != 0)
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/ndbapi/bank/testBank.cpp

@@ -32,7 +32,7 @@
 #include "Bank.hpp"
 
 int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
-  Bank bank;
+  Bank bank(ctx->m_cluster_connection);
   int overWriteExisting = true;
   if (bank.createAndLoadBank(overWriteExisting) != NDBT_OK)
     return NDBT_FAILED;
@@ -40,7 +40,7 @@ int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 int runBankTimer(NDBT_Context* ctx, NDBT_Step* step){
-  Bank bank;
+  Bank bank(ctx->m_cluster_connection);
   int wait = 30; // Max seconds between each "day"
   int yield = 1; // Loops before bank returns 
 
@@ -51,7 +51,7 @@ int runBankTimer(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 int runBankTransactions(NDBT_Context* ctx, NDBT_Step* step){
-  Bank bank;
+  Bank bank(ctx->m_cluster_connection);
   int wait = 10; // Max ms between each transaction
   int yield = 100; // Loops before bank returns 
 
@@ -62,7 +62,7 @@ int runBankTransactions(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 int runBankGL(NDBT_Context* ctx, NDBT_Step* step){
-  Bank bank;
+  Bank bank(ctx->m_cluster_connection);
   int yield = 20; // Loops before bank returns 
   int result = NDBT_OK;
 
@@ -76,7 +76,7 @@ int runBankGL(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 int runBankSum(NDBT_Context* ctx, NDBT_Step* step){
-  Bank bank;
+  Bank bank(ctx->m_cluster_connection);
   int wait = 2000; // Max ms between each sum of accounts
   int yield = 1; // Loops before bank returns 
   int result = NDBT_OK;
@@ -91,7 +91,7 @@ int runBankSum(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 int runDropBank(NDBT_Context* ctx, NDBT_Step* step){
-  Bank bank;
+  Bank bank(ctx->m_cluster_connection);
   if (bank.dropBank() != NDBT_OK)
     return NDBT_FAILED;
   return NDBT_OK;

ndb/test/ndbapi/create_all_tabs.cpp

@@ -47,7 +47,12 @@ int main(int argc, const char** argv){
   }
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
   
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/ndbapi/create_tab.cpp

@@ -77,8 +77,12 @@ int main(int argc, const char** argv){
      */
     
     // Connect to Ndb
-    Ndb MyNdb( "TEST_DB" );
-    MyNdb.setConnectString(_connectstr);
+    Ndb_cluster_connection con(_connectstr);
+    if(con.connect(12, 5, 1) != 0)
+    {
+      return NDBT_ProgramExit(NDBT_FAILED);
+    }
+    Ndb MyNdb(&con, "TEST_DB" );
     
     if(MyNdb.init() != 0){
       ERR(MyNdb.getNdbError());

ndb/test/ndbapi/drop_all_tabs.cpp

@@ -40,7 +40,13 @@ int main(int argc, const char** argv){
   }
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  Ndb MyNdb(&con, "TEST_DB" );
   
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/ndbapi/flexBench.cpp

@@ -279,6 +279,8 @@ tellThreads(ThreadData* pt, StartType what)
     pt[i].threadStart = what;
 }
 
+static Ndb_cluster_connection *g_cluster_connection= 0;
+
 NDB_COMMAND(flexBench, "flexBench", "flexBench", "flexbench", 65535)
 {
   ndb_init();
@@ -326,8 +328,16 @@ NDB_COMMAND(flexBench, "flexBench", "flexBench", "flexbench", 65535)
   
   NdbThread_SetConcurrencyLevel(tNoOfThreads + 2);
 
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+
+  g_cluster_connection= &con;
+
   Ndb* pNdb;
-  pNdb = new Ndb( "TEST_DB" );  
+  pNdb = new Ndb(&con, "TEST_DB" );  
   pNdb->init();
 
   tNodeId = pNdb->getNodeId();
@@ -605,7 +615,7 @@ static void* flexBenchThread(void* pArg)
   attrValue = (int*)malloc(nReadBuffSize) ;
   attrRefValue = (int*)malloc(nRefBuffSize) ;
   pOps = (NdbOperation**)malloc(tNoOfTables*sizeof(NdbOperation*)) ;
-  pNdb = new Ndb( "TEST_DB" );
+  pNdb = new Ndb(g_cluster_connection, "TEST_DB" );
   
   if(!attrValue || !attrRefValue || !pOps || !pNdb){
     // Check allocations to make sure we got all the memory we asked for

ndb/test/src/NDBT_Test.cpp

@@ -26,7 +26,9 @@
 
 // No verbose outxput
 
-NDBT_Context::NDBT_Context(){
+NDBT_Context::NDBT_Context(Ndb_cluster_connection& con)
+  : m_cluster_connection(con)
+{
   tab = NULL;
   suite = NULL;
   testcase = NULL;
@@ -239,7 +241,7 @@ int NDBT_Step::execute(NDBT_Context* ctx) {
   g_info << "  |- " << name << " started [" << ctx->suite->getDate() << "]" 
 	 << endl;
   
-  result = setUp();
+  result = setUp(ctx->m_cluster_connection);
   if (result != NDBT_OK){
     return result;
   }
@@ -279,8 +281,8 @@ NDBT_NdbApiStep::NDBT_NdbApiStep(NDBT_TestCase* ptest,
 
 
 int
-NDBT_NdbApiStep::setUp(){
-  ndb = new Ndb( "TEST_DB" );
+NDBT_NdbApiStep::setUp(Ndb_cluster_connection& con){
+  ndb = new Ndb(&con, "TEST_DB" );
   ndb->init(1024);
   
   int result = ndb->waitUntilReady(300); // 5 minutes
@@ -745,14 +747,15 @@ int NDBT_TestSuite::addTest(NDBT_TestCase* pTest){
   return 0;
 }
 
-int NDBT_TestSuite::executeAll(const char* _testname){
+int NDBT_TestSuite::executeAll(Ndb_cluster_connection& con,
+			       const char* _testname){
 
   if(tests.size() == 0)
     return NDBT_FAILED;
-  Ndb ndb("TEST_DB");
+  Ndb ndb(&con, "TEST_DB");
   ndb.init(1024);
 
-  int result = ndb.waitUntilReady(300); // 5 minutes
+  int result = ndb.waitUntilReady(500); // 5 minutes
   if (result != 0){
     g_err << name <<": Ndb was not ready" << endl;
     return NDBT_FAILED;
@@ -765,18 +768,19 @@ int NDBT_TestSuite::executeAll(const char* _testname){
   for (int t=0; t < NDBT_Tables::getNumTables(); t++){
     const NdbDictionary::Table* ptab = NDBT_Tables::getTable(t);
     ndbout << "|- " << ptab->getName() << endl;
-    execute(&ndb, ptab, _testname);
+    execute(con, &ndb, ptab, _testname);
   }
   testSuiteTimer.doStop();
   return reportAllTables(_testname);
 }
 
 int 
-NDBT_TestSuite::executeOne(const char* _tabname, const char* _testname){
+NDBT_TestSuite::executeOne(Ndb_cluster_connection& con,
+			   const char* _tabname, const char* _testname){
   
   if(tests.size() == 0)
     return NDBT_FAILED;
-  Ndb ndb("TEST_DB");
+  Ndb ndb(&con, "TEST_DB");
   ndb.init(1024);
 
   int result = ndb.waitUntilReady(300); // 5 minutes
@@ -793,7 +797,7 @@ NDBT_TestSuite::executeOne(const char* _tabname, const char* _testname){
 
   ndbout << "|- " << ptab->getName() << endl;
 
-  execute(&ndb, ptab, _testname);
+  execute(con, &ndb, ptab, _testname);
 
   if (numTestsFail > 0){
     return NDBT_FAILED;
@@ -802,7 +806,8 @@ NDBT_TestSuite::executeOne(const char* _tabname, const char* _testname){
   }
 }
 
-void NDBT_TestSuite::execute(Ndb* ndb, const NdbDictionary::Table* pTab, 
+void NDBT_TestSuite::execute(Ndb_cluster_connection& con,
+			     Ndb* ndb, const NdbDictionary::Table* pTab, 
 			     const char* _testname){
   int result; 
 
@@ -844,7 +849,7 @@ void NDBT_TestSuite::execute(Ndb* ndb, const NdbDictionary::Table* pTab,
       pTab2 = pTab;
     } 
     
-    ctx = new NDBT_Context();
+    ctx = new NDBT_Context(con);
     ctx->setTab(pTab2);
     ctx->setNumRecords(records);
     ctx->setNumLoops(loops);
@@ -1023,14 +1028,19 @@ int NDBT_TestSuite::execute(int argc, const char** argv){
   loops = _loops;
   timer = _timer;
 
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1))
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  
   if(optind == argc){
     // No table specified
-    res = executeAll(_testname);
+    res = executeAll(con, _testname);
   } else {
     testSuiteTimer.doStart(); 
-    Ndb ndb("TEST_DB"); ndb.init();
     for(int i = optind; i<argc; i++){
-      executeOne(argv[i], _testname);
+      executeOne(con, argv[i], _testname);
     }
     testSuiteTimer.doStop();
     res = report(_testname);

ndb/test/tools/copy_tab.cpp

@@ -56,9 +56,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
   _to_tabname = argv[optind+1];
   
-  if (_connectstr)
-    Ndb::setConnectString(_connectstr);
-  Ndb MyNdb(_dbname);
+  Ndb_cluster_connection con(_connectstr);
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con,_dbname);
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/tools/create_index.cpp

@@ -53,8 +53,13 @@ main(int argc, const char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
   
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
 
-  Ndb MyNdb(_dbname);
+  Ndb MyNdb(&con, _dbname);
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());
     return NDBT_ProgramExit(NDBT_FAILED);

ndb/test/tools/hugoFill.cpp

@@ -51,7 +51,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
   
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/hugoLoad.cpp

@@ -54,7 +54,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
   
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/hugoLockRecords.cpp

@@ -59,7 +59,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/hugoPkDelete.cpp

@@ -55,7 +55,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/hugoPkRead.cpp

@@ -60,7 +60,12 @@ int main(int argc, const char** argv){
 
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/hugoPkReadRecord.cpp

@@ -62,7 +62,12 @@ int main(int argc, const char** argv)
 	 << "Row: " << _row << ", PrimaryKey: " << _primaryKey
 	 << endl;
 
-  Ndb* ndb = new Ndb("TEST_DB");
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb* ndb = new Ndb(&con, "TEST_DB");
   if (ndb->init() == 0 && ndb->waitUntilReady(30) == 0)
   {
     NdbConnection* conn = ndb->startTransaction();

ndb/test/tools/hugoPkUpdate.cpp

@@ -57,7 +57,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/hugoScanRead.cpp

@@ -61,7 +61,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/hugoScanUpdate.cpp

@@ -58,7 +58,12 @@ int main(int argc, const char** argv){
   _tabname = argv[optind];
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());

ndb/test/tools/verify_index.cpp

@@ -53,7 +53,12 @@ int main(int argc, const char** argv){
   _indexname = argv[optind+1];
 
   // Connect to Ndb
-  Ndb MyNdb( "TEST_DB" );
+  Ndb_cluster_connection con;
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, "TEST_DB" );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());