Commit bf39ae6a authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
parents 32f93da0 00534590

ndb/src/mgmsrv/MgmtSrvr.cpp

+8 −3
Original line number Diff line number Diff line
@@ -432,15 +432,20 @@ MgmtSrvr::MgmtSrvr(SocketServer *socket_server, 
  theFacade = 0;



  m_newConfig = NULL;

  if (config_filename)

    m_configFilename.assign(config_filename);

  else

    m_configFilename.assign("config.ini");



  m_nextConfigGenerationNumber = 0;



  m_config_retriever= new ConfigRetriever(connect_string,

					  NDB_VERSION, NDB_MGM_NODE_TYPE_MGM);



  // if connect_string explicitly given or

  // no config filename is given then

  // first try to allocate nodeid from another management server

  if(m_config_retriever->do_connect(0,0,0) == 0)

  if ((connect_string || config_filename == NULL) &&

      (m_config_retriever->do_connect(0,0,0) == 0))

  {

    int tmp_nodeid= 0;

    tmp_nodeid= m_config_retriever->allocNodeId(0 /*retry*/,0 /*delay*/);

ndb/src/mgmsrv/main.cpp

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ int main(int argc, char** argv) 
#endif



  global_mgmt_server_check = 1;

  glob.config_filename= "config.ini";



  const char *load_default_groups[]= { "mysql_cluster","ndb_mgmd",0 };

  load_defaults("my",load_default_groups,&argc,&argv);