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, 7 insertions, 6 deletions

diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp
index b3257491123..2ab11250d81 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -175,11 +175,10 @@ public:
 
   /* Constructor */
 
-  MgmtSrvr(NodeId nodeId,                    /* Local nodeid */
-	   SocketServer *socket_server,
-	   const BaseString &config_filename,      /* Where to save config */
-	   LocalConfig &local_config,  /* Ndb.cfg filename */
-	   Config * config); 
+  MgmtSrvr(SocketServer *socket_server,
+	   const char *config_filename,      /* Where to save config */
+	   const char *connect_string); 
+  int init();
   NodeId getOwnNodeId() const {return _ownNodeId;};
 
   /**
@@ -538,7 +537,6 @@ private:
   NdbMutex *m_configMutex;
   const Config * _config;
   Config * m_newConfig;
-  LocalConfig &m_local_config;
   BaseString m_configFilename;
   Uint32 m_nextConfigGenerationNumber;
   
@@ -755,6 +753,9 @@ private:
   Config *_props;
 
   int send(class NdbApiSignal* signal, Uint32 node, Uint32 node_type);
+
+  ConfigRetriever *m_config_retriever;
+
 public:
   /**
    * This method does not exist