changed mysqladmin.c to mysqladmin.cc

    no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
    aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
    removed all dependencies of LocalConfig, except for mgmapi internals
    enabled multiple management servrs to fetch data configurations from eachother


client/Makefile.am:
  changed mysqladmin.c to mysqladmin.cc
client/mysqladmin.cc:
  changed mysqladmin.c to mysqladmin.cc
configure.in:
  no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
ndb/include/mgmapi/mgmapi.h:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/mgmcommon/ConfigRetriever.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/main.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/vm/Configuration.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
  changed to config setting to always use noOfMetaTables to make sure we don't overflow arrays
ndb/src/kernel/vm/Configuration.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/mgmapi.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/CommandInterpreter.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/main.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.h:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvr.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
  enabled multiple management servrs to fetch data configurations from eachother
ndb/src/mgmsrv/MgmtSrvr.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/main.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/tools/waiter.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals

1 files changed, 9 insertions, 21 deletions

diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp
index d940f6e165a..00e0a8c1919 100644
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -153,7 +153,6 @@ private:
 
   NdbMgmHandle m_mgmsrv;
   bool connected;
-  const char *host;
   int try_reconnect;
 #ifdef HAVE_GLOBAL_REPLICATION  
   NdbRepHandle m_repserver;
@@ -193,7 +192,7 @@ extern "C" {
   {
     return (Ndb_mgmclient_handle) new Ndb_mgmclient(connect_string);
   }
-  int ndb_mgmclient_execute(Ndb_mgmclient_handle h, int argc, const char** argv)
+  int ndb_mgmclient_execute(Ndb_mgmclient_handle h, int argc, char** argv)
   {
     return ((Ndb_mgmclient*)h)->execute(argc, argv, 1);
   }
@@ -226,7 +225,7 @@ extern "C" {
 #include <util/InputStream.hpp>
 #include <util/OutputStream.hpp>
 
-int Ndb_mgmclient::execute(int argc, const char** argv, int _try_reconnect)
+int Ndb_mgmclient::execute(int argc, char** argv, int _try_reconnect)
 {
   if (argc <= 0)
     return 0;
@@ -379,15 +378,16 @@ CommandInterpreter::CommandInterpreter(const char *_host)
   m_mgmsrv = ndb_mgm_create_handle();
   if(m_mgmsrv == NULL) {
     ndbout_c("Cannot create handle to management server.");
+    exit(-1);
+  }
+  if (ndb_mgm_set_connectstring(m_mgmsrv, _host))
+  {
     printError();
+    exit(-1);
   }
 
   connected = false;
   try_reconnect = 0;
-  if (_host)
-    host= my_strdup(_host,MYF(MY_WME));
-  else
-    host= 0;
 #ifdef HAVE_GLOBAL_REPLICATION
   rep_host = NULL;
   m_repserver = NULL;
@@ -402,8 +402,6 @@ CommandInterpreter::~CommandInterpreter()
 {
   connected = false;
   ndb_mgm_destroy_handle(&m_mgmsrv);
-  my_free((char *)host,MYF(MY_ALLOW_ZERO_PTR));
-  host = NULL;
 }
 
 static bool 
@@ -438,18 +436,8 @@ bool
 CommandInterpreter::connect() 
 {
   if(!connected) {
-    int tries = try_reconnect; // tries == 0 => infinite
-    while(!connected) {
-      if(ndb_mgm_connect(m_mgmsrv, host) == -1) {
-	ndbout << "Cannot connect to management server (" << host << ").";
-	tries--;
-	if (tries == 0)
-	  break;
-	ndbout << "Retrying in 5 seconds." << endl;
-	NdbSleep_SecSleep(5);
-      } else
-	connected = true;
-    }
+    if(!ndb_mgm_connect(m_mgmsrv, try_reconnect-1, 5, 1))
+      connected = true;
   }
   return connected;
 }