merge with 4.1

16 files changed, 18 insertions, 2 deletions

diff --git a/ndb/test/tools/copy_tab.cpp b/ndb/test/tools/copy_tab.cpp
index 33ce8e01d9a..30141acaa78 100644
--- a/ndb/test/tools/copy_tab.cpp
+++ b/ndb/test/tools/copy_tab.cpp
@@ -24,6 +24,7 @@
 #include <getarg.h>
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   const char* _tabname = NULL;
   const char* _to_tabname = NULL;
diff --git a/ndb/test/tools/cpcc.cpp b/ndb/test/tools/cpcc.cpp
index e30d458ffee..dd59e577f2c 100644
--- a/ndb/test/tools/cpcc.cpp
+++ b/ndb/test/tools/cpcc.cpp
@@ -173,6 +173,7 @@ add_hosts(Vector<SimpleCpcClient*> & hosts, BaseString list){
 
 int 
 main(int argc, const char** argv){
+  ndb_init();
   int help = 0;
   const char *cmd=0, *name=0, *group=0, *owner=0;
   int list = 0, start = 0, stop = 0, rm = 0;
diff --git a/ndb/test/tools/create_index.cpp b/ndb/test/tools/create_index.cpp
index f883755ea24..75a657522f6 100644
--- a/ndb/test/tools/create_index.cpp
+++ b/ndb/test/tools/create_index.cpp
@@ -26,6 +26,7 @@
 
 int 
 main(int argc, const char** argv){
+  ndb_init();
 
   const char* _dbname = "TEST_DB";
   int _help = 0;
diff --git a/ndb/test/tools/hugoCalculator.cpp b/ndb/test/tools/hugoCalculator.cpp
index 7f2751be2ba..82c4bbff1a4 100644
--- a/ndb/test/tools/hugoCalculator.cpp
+++ b/ndb/test/tools/hugoCalculator.cpp
@@ -28,6 +28,7 @@
 
 int main(int argc, const char** argv)
 {
+  ndb_init();
   int _row = 0;
   int _column = 0;
   int _updates = 0;
diff --git a/ndb/test/tools/hugoFill.cpp b/ndb/test/tools/hugoFill.cpp
index dee6ce2e6c8..6253bd1bb12 100644
--- a/ndb/test/tools/hugoFill.cpp
+++ b/ndb/test/tools/hugoFill.cpp
@@ -25,6 +25,7 @@
 
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   const char* _tabname = NULL;
diff --git a/ndb/test/tools/hugoLoad.cpp b/ndb/test/tools/hugoLoad.cpp
index be7f878d106..c697ad22aad 100644
--- a/ndb/test/tools/hugoLoad.cpp
+++ b/ndb/test/tools/hugoLoad.cpp
@@ -24,6 +24,7 @@
 
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   const char* _tabname = NULL;
diff --git a/ndb/test/tools/hugoLockRecords.cpp b/ndb/test/tools/hugoLockRecords.cpp
index e2c2cd13f00..629408d401d 100644
--- a/ndb/test/tools/hugoLockRecords.cpp
+++ b/ndb/test/tools/hugoLockRecords.cpp
@@ -27,6 +27,7 @@
 #include <HugoTransactions.hpp>
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   int _loops = 1;
diff --git a/ndb/test/tools/hugoPkDelete.cpp b/ndb/test/tools/hugoPkDelete.cpp
index 1855f19796f..78a90ebcb46 100644
--- a/ndb/test/tools/hugoPkDelete.cpp
+++ b/ndb/test/tools/hugoPkDelete.cpp
@@ -27,6 +27,7 @@
 #include <HugoTransactions.hpp>
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   int _loops = 1;
diff --git a/ndb/test/tools/hugoPkRead.cpp b/ndb/test/tools/hugoPkRead.cpp
index 50351f08195..cf08b137e8e 100644
--- a/ndb/test/tools/hugoPkRead.cpp
+++ b/ndb/test/tools/hugoPkRead.cpp
@@ -28,6 +28,7 @@
 
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   int _loops = 1;
diff --git a/ndb/test/tools/hugoPkReadRecord.cpp b/ndb/test/tools/hugoPkReadRecord.cpp
index 85f20bd2060..38b7cae2bf4 100644
--- a/ndb/test/tools/hugoPkReadRecord.cpp
+++ b/ndb/test/tools/hugoPkReadRecord.cpp
@@ -28,6 +28,7 @@
 
 int main(int argc, const char** argv)
 {
+  ndb_init();
   int _row = 0;
   int _hex = 0;
   int _primaryKey = 0;
diff --git a/ndb/test/tools/hugoPkUpdate.cpp b/ndb/test/tools/hugoPkUpdate.cpp
index e7edc3a991d..286be14a01c 100644
--- a/ndb/test/tools/hugoPkUpdate.cpp
+++ b/ndb/test/tools/hugoPkUpdate.cpp
@@ -27,6 +27,7 @@
 #include <HugoTransactions.hpp>
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   int _loops = 1;
diff --git a/ndb/test/tools/hugoScanRead.cpp b/ndb/test/tools/hugoScanRead.cpp
index 47ea8f4a8a7..cdfdcea4654 100644
--- a/ndb/test/tools/hugoScanRead.cpp
+++ b/ndb/test/tools/hugoScanRead.cpp
@@ -27,6 +27,7 @@
 #include <HugoTransactions.hpp>
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   int _loops = 1;
diff --git a/ndb/test/tools/hugoScanUpdate.cpp b/ndb/test/tools/hugoScanUpdate.cpp
index 3e2255ca0f3..96a487a02bf 100644
--- a/ndb/test/tools/hugoScanUpdate.cpp
+++ b/ndb/test/tools/hugoScanUpdate.cpp
@@ -27,6 +27,7 @@
 #include <HugoTransactions.hpp>
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   int _records = 0;
   int _loops = 1;
diff --git a/ndb/test/tools/restart.cpp b/ndb/test/tools/restart.cpp
index 88cfb231a72..9ad20801fd7 100644
--- a/ndb/test/tools/restart.cpp
+++ b/ndb/test/tools/restart.cpp
@@ -27,6 +27,7 @@
 #include <NDBT.hpp>
 
 int main(int argc, const char** argv){
+  ndb_init();
 
   const char* _hostName = NULL;
   int _initial = 0;
diff --git a/ndb/test/tools/transproxy.cpp b/ndb/test/tools/transproxy.cpp
index 384a8a34f03..88267801172 100644
--- a/ndb/test/tools/transproxy.cpp
+++ b/ndb/test/tools/transproxy.cpp
@@ -32,7 +32,7 @@ fatal(char const* fmt, ...)
     va_list ap;
     char buf[200];
     va_start(ap, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, ap);
+    BaseString::vsnprintf(buf, sizeof(buf), fmt, ap);
     va_end(ap);
     ndbout << "FATAL: " << buf << endl;
     sleep(1);
@@ -45,7 +45,7 @@ debug(char const* fmt, ...)
     va_list ap;
     char buf[200];
     va_start(ap, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, ap);
+    BaseString::vsnprintf(buf, sizeof(buf), fmt, ap);
     va_end(ap);
     ndbout << buf << endl;
 }
@@ -346,6 +346,7 @@ start()
 int
 main(int av, char** ac)
 {
+    ndb_init();
     debug("start");
     hostname = "ndb-srv7";
     if (Ndb_getInAddr(&hostaddr.sin_addr, hostname) != 0) {
diff --git a/ndb/test/tools/verify_index.cpp b/ndb/test/tools/verify_index.cpp
index 1295b657e9b..6c8e304e1a1 100644
--- a/ndb/test/tools/verify_index.cpp
+++ b/ndb/test/tools/verify_index.cpp
@@ -27,6 +27,7 @@
  
 
 int main(int argc, const char** argv){
+  ndb_init();
   int _parallelism = 240;
   const char* _tabname = NULL;
   const char* _indexname = NULL;