Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port

ndb/docs/doxygen/Doxyfile.mgmapi

@@ -190,7 +190,7 @@ DISTRIBUTE_GROUP_DOC   = NO
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 2
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
@@ -245,7 +245,7 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 # at the bottom of the documentation of classes and structs. If set to YES the 
 # list will mention the files that were used to generate the documentation.
 
-SHOW_USED_FILES        = YES
+SHOW_USED_FILES        = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -447,7 +447,7 @@ HTML_STYLESHEET        =
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS     = YES
+HTML_ALIGN_MEMBERS     = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
@@ -477,7 +477,7 @@ TOC_EXPAND             = NO
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.

ndb/docs/doxygen/Doxyfile.ndb

@@ -201,7 +201,7 @@ DISTRIBUTE_GROUP_DOC   = NO
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 2
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
@@ -485,7 +485,7 @@ HTML_STYLESHEET        =
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS     = YES
+HTML_ALIGN_MEMBERS     = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
@@ -515,7 +515,7 @@ TOC_EXPAND             = NO
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.

ndb/docs/doxygen/Doxyfile.ndbapi

@@ -190,7 +190,7 @@ DISTRIBUTE_GROUP_DOC   = NO
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 2
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
@@ -245,7 +245,7 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 # at the bottom of the documentation of classes and structs. If set to YES the 
 # list will mention the files that were used to generate the documentation.
 
-SHOW_USED_FILES        = YES
+SHOW_USED_FILES        = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -447,7 +447,7 @@ HTML_STYLESHEET        =
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS     = YES
+HTML_ALIGN_MEMBERS     = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
@@ -477,7 +477,7 @@ TOC_EXPAND             = NO
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.

ndb/docs/doxygen/Doxyfile.odbc

@@ -201,7 +201,7 @@ DISTRIBUTE_GROUP_DOC   = NO
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 2
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
@@ -256,7 +256,7 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 # at the bottom of the documentation of classes and structs. If set to YES the 
 # list will mention the files that were used to generate the documentation.
 
-SHOW_USED_FILES        = YES
+SHOW_USED_FILES        = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -469,7 +469,7 @@ HTML_STYLESHEET        =
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS     = YES
+HTML_ALIGN_MEMBERS     = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
@@ -499,7 +499,7 @@ TOC_EXPAND             = NO
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.

ndb/docs/doxygen/Doxyfile.test

@@ -201,7 +201,7 @@ DISTRIBUTE_GROUP_DOC   = NO
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 2
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
@@ -256,7 +256,7 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 # at the bottom of the documentation of classes and structs. If set to YES the 
 # list will mention the files that were used to generate the documentation.
 
-SHOW_USED_FILES        = YES
+SHOW_USED_FILES        = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -469,7 +469,7 @@ HTML_STYLESHEET        =
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS     = YES
+HTML_ALIGN_MEMBERS     = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
@@ -499,7 +499,7 @@ TOC_EXPAND             = NO
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # This tag can be used to set the number of enum values (range [1..20]) 
 # that doxygen will group on one line in the generated HTML documentation.

ndb/include/mgmapi/mgmapi.h

@@ -30,9 +30,9 @@
  * @section  General Concepts
  *
  * Each MGM API function needs a management server handle
- * of type <code>Mgm_C_Api::NdbMgmHandle</code>.
+ * of type Mgm_C_Api::NdbMgmHandle.
  * This handle is initally created by calling the
- * function <code>ndb_mgm_create_handle()</code>.
+ * function ndb_mgm_create_handle().
  *
  * A function can return:
  *  -# An integer value.

ndb/include/ndbapi/Ndb.hpp

@@ -23,31 +23,31 @@
    The <em>NDB API</em> is a MySQL Cluster application interface 
    that implements transactions.
    The NDB API consists of the following fundamental classes:
-   - <code>Ndb_cluster_connection</code>, representing a connection to a cluster, 
-   - <code>Ndb</code> is the main class, representing the database, 
-   - <code>NdbTransaction</code> represents a transaction, 
-   - <code>NdbOperation</code> represents an operation using a primary key,
-   - <code>NdbScanOperation</code> represents an operation performing a full table scan.
-   - <code>NdbIndexOperation</code> represents an operation using a unique hash index,
-   - <code>NdbIndexScanOperation</code> represents an operation performing a scan using
+   - Ndb_cluster_connection, representing a connection to a cluster, 
+   - Ndb is the main class, representing the database, 
+   - NdbTransaction represents a transaction, 
+   - NdbOperation represents an operation using a primary key,
+   - NdbScanOperation represents an operation performing a full table scan.
+   - NdbIndexOperation represents an operation using a unique hash index,
+   - NdbIndexScanOperation represents an operation performing a scan using
      an ordered index,
-   - <code>NdbRecAttr</code> represents an attribute value
-   - <code>NdbDictionary</code> represents meta information about tables and attributes.
-   - <code>NdbError</code> contains the specification for an error.
+   - NdbRecAttr represents an attribute value
+   - NdbDictionary represents meta information about tables and attributes.
+   - NdbError contains the specification for an error.
    There are also some auxiliary classes.
      
    The main structure of an application program is as follows:
-   -# Construct and connect to a cluster using the <code>Ndb_cluster_connection</code>
+   -# Construct and connect to a cluster using the Ndb_cluster_connection
       object.
-   -# Construct and initialize <code>Ndb</code> object(s).
-   -# Define and execute transactions using <code>NdbTransaction</code> and <code>Ndb*Operation</code>.
-   -# Delete <code>Ndb</code> objects
+   -# Construct and initialize Ndb object(s).
+   -# Define and execute transactions using NdbTransaction and Ndb*Operation.
+   -# Delete Ndb objects
    -# Delete cluster connection
 
    The main structure of a transaction is as follows:
-   -# Start transaction (an <code>NdbTransaction</code>)
+   -# Start transaction (an NdbTransaction)
    -# Add and define operations associated with the transaction using
-      <code>Ndb*Operation</code>
+      Ndb*Operation
    -# Execute transaction
 
    The execution can be of two different types, 
@@ -69,41 +69,41 @@
    Synchronous transactions are defined and executed as follows:
   
     -# Start (create) the transaction, which is
-       referenced by an <code>NdbTransaction</code> object 
-       (typically created using <code>Ndb::startTransaction()</code>).
+       referenced by an NdbTransaction object 
+       (typically created using Ndb::startTransaction()).
        At this point, the transaction is only being defined,
        and is not yet sent to the NDB kernel.
     -# Define operations and add them to the transaction, 
-       using <code>NdbTransaction::getNdb*Operation()</code> and
-       methods of the <code>Ndb*Operation</code> class.
+       using NdbTransaction::getNdb*Operation() and
+       methods of the Ndb*Operation class.
        Note that the transaction has still not yet been sent to the NDB kernel.
-    -# Execute the transaction, using the <code>NdbTransaction::execute()</code> method.
-    -# Close the transaction (using <code>Ndb::closeTransaction()</code>).
+    -# Execute the transaction, using the NdbTransaction::execute() method.
+    -# Close the transaction (using Ndb::closeTransaction()).
   
    For an example of this process, see the program listing in @ref ndbapi_example1.cpp.
 
    To execute several parallel synchronous transactions, one can either 
-   use multiple <code>Ndb</code> objects in several threads, or start multiple 
+   use multiple Ndb objects in several threads, or start multiple 
    applications programs.  
 
    @section secNdbOperations            Operations
 
-   Each <code>NdbTransaction</code>
+   Each NdbTransaction
    consists of a list of operations which are represented by instances 
-   of <code>Ndb*Operation</code>.
+   of Ndb*Operation.
 
    <h3>Single row operations</h3>
-   After the operation is created using <code>NdbTransaction::getNdbOperation()</code>
-   (or <code>NdbTransaction::getNdbIndexOperation()</code>), it is defined in the following 
+   After the operation is created using NdbTransaction::getNdbOperation()
+   (or NdbTransaction::getNdbIndexOperation()), it is defined in the following 
    three steps:
-   -# Define the standard operation type, using <code>NdbOperation::readTuple()</code>
-   -# Specify search conditions, using <code>NdbOperation::equal()</code>
-   -# Specify attribute actions, using <code>NdbOperation::getValue()</code>
+   -# Define the standard operation type, using NdbOperation::readTuple()
+   -# Specify search conditions, using NdbOperation::equal()
+   -# Specify attribute actions, using NdbOperation::getValue()
 
    Here are two brief examples illustrating this process. For the sake of brevity, 
    we omit error-handling.
    
-   This first example uses an <code>NdbOperation</code>:
+   This first example uses an NdbOperation:
    @code
      // 1. Create
      MyOperation= MyTransaction->getNdbOperation("MYTABLENAME");
@@ -120,7 +120,7 @@
    For additional examples of this sort, see @ref ndbapi_example1.cpp and 
    @ref ndbapi_example2.cpp.
 
-   The second example uses an <code>NdbIndexOperation</code>:
+   The second example uses an NdbIndexOperation:
    @code
      // 1. Create
      MyOperation= MyTransaction->getNdbIndexOperation("MYINDEX", "MYTABLENAME");
@@ -139,8 +139,6 @@
    We will now discuss in somewhat greater detail each step involved in the creation 
    and use of synchronous transactions.
 
-  //  Edit stop point - JS, 20041228 0425+1000
-
    <h4>Step 1: Define single row operation type</h4>
    The following types of operations exist:
     -# NdbOperation::insertTuple : 
@@ -211,19 +209,19 @@
    - They can be used to update or delete multiple rows
    - They can operate on several nodes in parallell
 
-   After the operation is created using <code>NdbTransaction::getNdbScanOperation()</code>
-   (or <code>NdbTransaction::getNdbIndexScanOperation()</code>), it is defined in the following 
+   After the operation is created using NdbTransaction::getNdbScanOperation()
+   (or NdbTransaction::getNdbIndexScanOperation()), it is defined in the following 
    three steps:
-   -# Define the standard operation type, using <code>NdbScanOperation::readTuples()</code>
+   -# Define the standard operation type, using NdbScanOperation::readTuples()
    -# Specify search conditions, using @ref NdbScanFilter and/or @ref NdbIndexScanOperation::setBound
-   -# Specify attribute actions, using <code>NdbOperation::getValue()</code>
-   -# Executing the transaction, using <code>NdbTransaction::execute()</code>
-   -# Iterating through the result set using <code>NdbScanOperation::nextResult</code>
+   -# Specify attribute actions, using NdbOperation::getValue()
+   -# Executing the transaction, using NdbTransaction::execute()
+   -# Iterating through the result set using NdbScanOperation::nextResult
 
    Here are two brief examples illustrating this process. For the sake of brevity, 
    we omit error-handling.
    
-   This first example uses an <code>NdbScanOperation</code>:
+   This first example uses an NdbScanOperation:
    @code
      // 1. Create
      MyOperation= MyTransaction->getNdbScanOperation("MYTABLENAME");
@@ -242,7 +240,7 @@
      MyRecAttr= MyOperation->getValue("ATTR2", NULL);
    @endcode
 
-   The second example uses an <code>NdbIndexScanOperation</code>:
+   The second example uses an NdbIndexScanOperation:
    @code
      // 1. Create
      MyOperation= MyTransaction->getNdbIndexScanOperation("MYORDEREDINDEX", "MYTABLENAME");
@@ -309,7 +307,7 @@
    -# When iterating through the result set, for each row optionally call 
       either NdbScanOperation::updateCurrentTuple or 
       NdbScanOperation::deleteCurrentTuple
-   -# If performing <code>NdbScanOperation::updateCurrentTuple</code>, 
+   -# If performing NdbScanOperation::updateCurrentTuple, 
       set new values on record using ordinary @ref NdbOperation::setValue.
       NdbOperation::equal should _not_ be called as the primary key is 
       retreived from the scan.
@@ -337,10 +335,10 @@
 
    But Ndb will only lock a batch of rows per fragment at a time.
    How many rows will be locked per fragment is controlled by the 
-   <code>batch</code> parameter to @ref NdbScanOperation::readTuples.
+   batch parameter to @ref NdbScanOperation::readTuples.
 
    To let the application handle how locks are released 
-   @ref NdbScanOperation::nextResult have a parameter <code>fetch_allow</code>.
+   @ref NdbScanOperation::nextResult have a parameter fetch_allow.
    If NdbScanOperation::nextResult is called with fetch_allow = false, no
    locks may be released as result of the function call. Otherwise the locks
    for the current batch may be released.

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/ndbapi/testBackup.cpp

@@ -216,7 +216,7 @@ int runDropTable(NDBT_Context* ctx, NDBT_Step* step){
 #include "bank/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, 10) != NDBT_OK)
     return NDBT_FAILED;
@@ -224,7 +224,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 
 
@@ -235,7 +235,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 
 
@@ -246,7 +246,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;
 
@@ -260,7 +260,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;
@@ -275,7 +275,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;
@@ -349,7 +349,7 @@ int runRestoreBankAndVerify(NDBT_Context* ctx, NDBT_Step* step){
     // To erase all tables from cache(s)
     // To be removed, maybe replaced by ndb.invalidate();
     {
-      Bank bank;
+      Bank bank(ctx->m_cluster_connection);
       
       if (bank.dropBank() != NDBT_OK){
 	result = NDBT_FAILED;
@@ -372,7 +372,7 @@ int runRestoreBankAndVerify(NDBT_Context* ctx, NDBT_Step* step){
     ndbout << "Backup " << backupId << " restored" << endl;
 
     // Let bank verify
-    Bank bank;
+    Bank bank(ctx->m_cluster_connection);
 
     int wait = 0;
     int yield = 1;

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());