mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
This commit is contained in:
stewart@mysql.com 2005-07-11 13:56:08 +10:00
commit 6549a72e4f
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ndb/include/mgmcommon/ConfigRetriever.hpp
View file

@ -32,6 +32,7 @@ public:
~ConfigRetriever();
int do_connect(int no_retries, int retry_delay_in_seconds, int verbose);
int disconnect();
/**
* Get configuration for current node.

6
ndb/src/common/mgmcommon/ConfigRetriever.cpp
View file

@ -107,6 +107,12 @@ ConfigRetriever::do_connect(int no_retries,
0 : -1;
}
int
ConfigRetriever::disconnect()
{
return ndb_mgm_disconnect(m_handle);
}
//****************************************************************************
//****************************************************************************
//****************************************************************************

3
ndb/src/mgmsrv/main.cpp
View file

@ -353,7 +353,8 @@ int main(int argc, char** argv)
g_eventLogger.info("Shutting down server...");
glob.socketServer->stopServer();
glob.socketServer->stopSessions();
glob.mgmObject->get_config_retriever()->disconnect();
glob.socketServer->stopSessions(true);
g_eventLogger.info("Shutdown complete");
return 0;
error_end: