diff options
| author | unknown <stewart@mysql.com> | 2005-07-11 13:56:08 +1000 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-07-11 13:56:08 +1000 |
| commit | 6951bad6f28777894618b51e94c6ba6e77cebe4e (patch) | |
| tree | a9bf61137e70ed7e506682492e7b9bd8e9815029 | |
| parent | fd0d97645cd1d27807f7044661785450a70b16a4 (diff) | |
| parent | ab0e8f2e126a7d6e69d883a083d3ceec89888aa0 (diff) | |
| download | mariadb-git-6951bad6f28777894618b51e94c6ba6e77cebe4e.tar.gz | |
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
| -rw-r--r-- | ndb/include/mgmcommon/ConfigRetriever.hpp | 1 | ||||
| -rw-r--r-- | ndb/src/common/mgmcommon/ConfigRetriever.cpp | 6 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/main.cpp | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ndb/include/mgmcommon/ConfigRetriever.hpp b/ndb/include/mgmcommon/ConfigRetriever.hpp index 95d257dea23..c0b877af07d 100644 --- a/ndb/include/mgmcommon/ConfigRetriever.hpp +++ b/ndb/include/mgmcommon/ConfigRetriever.hpp @@ -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. diff --git a/ndb/src/common/mgmcommon/ConfigRetriever.cpp b/ndb/src/common/mgmcommon/ConfigRetriever.cpp index eca886c8586..0e9b2a83e2f 100644 --- a/ndb/src/common/mgmcommon/ConfigRetriever.cpp +++ b/ndb/src/common/mgmcommon/ConfigRetriever.cpp @@ -107,6 +107,12 @@ ConfigRetriever::do_connect(int no_retries, 0 : -1; } +int +ConfigRetriever::disconnect() +{ + return ndb_mgm_disconnect(m_handle); +} + //**************************************************************************** //**************************************************************************** //**************************************************************************** diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp index 3335fdc827c..c7315c61ba1 100644 --- a/ndb/src/mgmsrv/main.cpp +++ b/ndb/src/mgmsrv/main.cpp @@ -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: |