bk commit into 5.0 tree (stewart:1.1895) BUG#11516

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1895 05/07/07 15:19:56 stewart@stripped +3 -0
  BUG#11516 ndb_mgmd debug core on cluster shutdown with failed data nodes
  
  Fix closing of sessions on mgm server shutdown.

  ndb/src/mgmsrv/main.cpp
    1.42 05/07/07 15:16:37 stewart@stripped +2 -1
    Close our ConfigRetriever connection first.
    
    Stop sessions, and wait for them to stop. (previously we didn't wait, this was
    causing core dumps on shutdown with failed nodes).

  ndb/src/common/mgmcommon/ConfigRetriever.cpp
    1.28 05/07/07 15:16:37 stewart@stripped +6 -0
    Add disconnect() call so we can disconnect from the mgm server before it shuts down
    (if we are a mgm server).

  ndb/include/mgmcommon/ConfigRetriever.hpp
    1.17 05/07/07 15:16:37 stewart@stripped +1 -0
    Add disconnect();

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/main

--- 1.16/ndb/include/mgmcommon/ConfigRetriever.hpp	2005-02-24 17:57:11 +11:00
+++ 1.17/ndb/include/mgmcommon/ConfigRetriever.hpp	2005-07-07 15:16:37 +10:00
@@ -32,6 +32,7 @@
   ~ConfigRetriever();
 
   int do_connect(int no_retries, int retry_delay_in_seconds, int verbose);
+  int disconnect();
   
   /**
    * Get configuration for current node.

--- 1.27/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2005-06-16 23:33:36 +10:00
+++ 1.28/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2005-07-07 15:16:37 +10:00
@@ -107,6 +107,12 @@
     0 : -1;
 }
 
+int
+ConfigRetriever::disconnect()
+{
+  return ndb_mgm_disconnect(m_handle);
+}
+
 //****************************************************************************
 //****************************************************************************
 //****************************************************************************

--- 1.41/ndb/src/mgmsrv/main.cpp	2005-02-22 09:15:23 +11:00
+++ 1.42/ndb/src/mgmsrv/main.cpp	2005-07-07 15:16:37 +10:00
@@ -353,7 +353,8 @@
   
   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: