9 files changed, 57 insertions, 19 deletions
diff --git a/ndb/tools/delete_all.cpp b/ndb/tools/delete_all.cpp
index eee76981eda..664fa616412 100644
--- a/ndb/tools/delete_all.cpp
+++ b/ndb/tools/delete_all.cpp
@@ -77,9 +77,12 @@ int main(int argc, char** argv){
   if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
-  Ndb::setConnectString(opt_connect_str);
-  // Connect to Ndb
-  Ndb MyNdb(_dbname);
+  Ndb_cluster_connection con(opt_connect_str);
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, _dbname );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());
diff --git a/ndb/tools/desc.cpp b/ndb/tools/desc.cpp
index fd7b243be2a..8c84802ef51 100644
--- a/ndb/tools/desc.cpp
+++ b/ndb/tools/desc.cpp
@@ -77,10 +77,13 @@ int main(int argc, char** argv){
   if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
-  Ndb::setConnectString(opt_connect_str);
+  Ndb_cluster_connection con(opt_connect_str);
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
 
-  Ndb* pMyNdb;
-  pMyNdb = new Ndb(_dbname);  
+  Ndb* pMyNdb = new Ndb(&con, _dbname);  
   pMyNdb->init();
   
   ndbout << "Waiting...";
diff --git a/ndb/tools/drop_index.cpp b/ndb/tools/drop_index.cpp
index 2b7f8c1bce9..cc0dd9a8be6 100644
--- a/ndb/tools/drop_index.cpp
+++ b/ndb/tools/drop_index.cpp
@@ -78,9 +78,13 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
   
-  Ndb::setConnectString(opt_connect_str);
-  // Connect to Ndb
-  Ndb MyNdb(_dbname);
+  Ndb_cluster_connection con(opt_connect_str);
+  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);
diff --git a/ndb/tools/drop_tab.cpp b/ndb/tools/drop_tab.cpp
index 2b0b6908449..81131c9060a 100644
--- a/ndb/tools/drop_tab.cpp
+++ b/ndb/tools/drop_tab.cpp
@@ -78,8 +78,13 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Ndb::setConnectString(opt_connect_str);
-  Ndb MyNdb(_dbname);
+  Ndb_cluster_connection con(opt_connect_str);
+  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);
diff --git a/ndb/tools/restore/consumer_restore.cpp b/ndb/tools/restore/consumer_restore.cpp
index 18049fd363f..dce03ad38bf 100644
--- a/ndb/tools/restore/consumer_restore.cpp
+++ b/ndb/tools/restore/consumer_restore.cpp
@@ -23,6 +23,7 @@ extern FilteredNdbOut debug;
 
 static void callback(int, NdbConnection*, void*);
 
+extern const char * g_connect_string;
 bool
 BackupRestore::init()
 {
@@ -31,7 +32,13 @@ BackupRestore::init()
   if (!m_restore && !m_restore_meta)
     return true;
 
-  m_ndb = new Ndb();
+  m_cluster_connection = new Ndb_cluster_connection(g_connect_string);
+  if(m_cluster_connection->connect(12, 5, 1) != 0)
+  {
+    return -1;
+  }
+
+  m_ndb = new Ndb(m_cluster_connection);
 
   if (m_ndb == NULL)
     return false;
@@ -77,6 +84,12 @@ void BackupRestore::release()
     delete [] m_callback;
     m_callback= 0;
   }
+
+  if (m_cluster_connection)
+  {
+    delete m_cluster_connection;
+    m_cluster_connection= 0;
+  }
 }
 
 BackupRestore::~BackupRestore()
diff --git a/ndb/tools/restore/consumer_restore.hpp b/ndb/tools/restore/consumer_restore.hpp
index f0fea54437a..1bf6d89a912 100644
--- a/ndb/tools/restore/consumer_restore.hpp
+++ b/ndb/tools/restore/consumer_restore.hpp
@@ -35,6 +35,7 @@ public:
   BackupRestore(Uint32 parallelism=1) 
   {
     m_ndb = 0;
+    m_cluster_connection = 0;
     m_logCount = m_dataCount = 0;
     m_restore = false;
     m_restore_meta = false;
@@ -62,6 +63,7 @@ public:
   virtual bool finalize_table(const TableS &);
   void connectToMysql();
   Ndb * m_ndb;
+  Ndb_cluster_connection * m_cluster_connection;
   bool m_restore;
   bool m_restore_meta;
   Uint32 m_logCount;
diff --git a/ndb/tools/restore/restore_main.cpp b/ndb/tools/restore/restore_main.cpp
index c24ed620b71..528a9634658 100644
--- a/ndb/tools/restore/restore_main.cpp
+++ b/ndb/tools/restore/restore_main.cpp
@@ -240,6 +240,8 @@ free_data_callback()
     g_consumers[i]->tuple_free();
 }
 
+const char * g_connect_string = 0;
+
 int
 main(int argc, char** argv)
 {
@@ -250,7 +252,7 @@ main(int argc, char** argv)
     return -1;
   }
 
-  Ndb::setConnectString(opt_connect_str);
+  g_connect_string = opt_connect_str;
 
   /**
    * we must always load meta data, even if we will only print it to stdout
diff --git a/ndb/tools/select_all.cpp b/ndb/tools/select_all.cpp
index 9c79d68fad3..1d8442335dd 100644
--- a/ndb/tools/select_all.cpp
+++ b/ndb/tools/select_all.cpp
@@ -124,9 +124,12 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Ndb::setConnectString(opt_connect_str);
-  // Connect to Ndb
-  Ndb MyNdb(_dbname);
+  Ndb_cluster_connection con(opt_connect_str);
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, _dbname );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());
diff --git a/ndb/tools/select_count.cpp b/ndb/tools/select_count.cpp
index 6975070e14d..156d31f70fd 100644
--- a/ndb/tools/select_count.cpp
+++ b/ndb/tools/select_count.cpp
@@ -97,9 +97,12 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
 
-  Ndb::setConnectString(opt_connect_str);
-  // Connect to Ndb
-  Ndb MyNdb(_dbname);
+  Ndb_cluster_connection con(opt_connect_str);
+  if(con.connect(12, 5, 1) != 0)
+  {
+    return NDBT_ProgramExit(NDBT_FAILED);
+  }
+  Ndb MyNdb(&con, _dbname );
 
   if(MyNdb.init() != 0){
     ERR(MyNdb.getNdbError());