Commit 6951bad6 authored Jul 11, 2005 by unknown

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

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

parents fd0d9764 ab0e8f2e

ndb/include/mgmcommon/ConfigRetriever.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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.

ndb/src/common/mgmcommon/ConfigRetriever.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,12 @@ ConfigRetriever::do_connect(int no_retries,
		0 : -1;
		}

		int
		ConfigRetriever::disconnect()
		{
		return ndb_mgm_disconnect(m_handle);
		}

		//****************************************************************************
		//****************************************************************************
		//****************************************************************************

ndb/src/mgmsrv/main.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -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: