bug#4529

ndb/include/mgmcommon/ConfigRetriever.hpp:
  Separate connect and all/fetch
ndb/include/mgmcommon/LocalConfig.hpp:
  Use BaseString
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Separate connect and all/fetch
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Removed useless onlyNodeId
ndb/src/kernel/main.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.hpp:
  Separeted Configuration fetch/setup
ndb/src/mgmapi/mgmapi.cpp:
  Fixed some return codes
ndb/src/mgmclient/main.cpp:
  LocalConfig update
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Changes ConfigRetreiver interface
ndb/src/mgmsrv/Services.cpp:
  Allow reserve same id twice
ndb/src/mgmsrv/main.cpp:
  Ignore SIGPIPE
ndb/src/ndbapi/TransporterFacade.cpp:
  ConfigRetriever interface

1 files changed, 3 insertions, 4 deletions

diff --git a/ndb/src/mgmsrv/MgmtSrvrConfig.cpp b/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
index 10316bd2851..44c2aadd1e2 100644
--- a/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
@@ -288,16 +288,15 @@ MgmtSrvr::readConfig() {
 
 Config *
 MgmtSrvr::fetchConfig() {
-  ConfigRetriever cr;
+  ConfigRetriever cr(NDB_VERSION, NODE_TYPE_MGM);
   cr.setLocalConfigFileName(m_localNdbConfigFilename.c_str());
-  struct ndb_mgm_configuration * tmp = cr.getConfig(NDB_VERSION,
-						    NODE_TYPE_MGM);
+  struct ndb_mgm_configuration * tmp = cr.getConfig();
   if(tmp != 0){
     Config * conf = new Config();
     conf->m_configValues = tmp;
     return conf;
   }
-
+  
   return 0;
 }