From: Date: May 18 2006 1:32pm
Subject: bk commit into 5.0 tree (stewart:1.2144) BUG#18966
List-Archive: http://lists.mysql.com/commits/6564
X-Bug: 18966
Message-Id: <20060518113231.4FBED1410E2D@localhost.localdomain>

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.2144 06/05/18 21:32:24 stewart@stripped +1 -0
  BUG#18966 Change in stop/shutdown behaviour
  
  Now need this fix to prevent crash of ndb_mgm on invalid mgm protocol.

  ndb/src/mgmclient/CommandInterpreter.cpp
    1.59 06/05/18 21:31:57 stewart@stripped +4 -4
    fix crash on invalid mgm protocol

# 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:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/jonas

--- 1.58/ndb/src/mgmclient/CommandInterpreter.cpp	2006-04-11 02:10:02 +10:00
+++ 1.59/ndb/src/mgmclient/CommandInterpreter.cpp	2006-05-18 21:31:57 +10:00
@@ -429,14 +429,14 @@
 void
 CommandInterpreter::printError() 
 {
-  if (ndb_mgm_check_connection(m_mgmsrv))
-  {
-    disconnect();
-  }
   ndbout_c("* %5d: %s", 
 	   ndb_mgm_get_latest_error(m_mgmsrv),
 	   ndb_mgm_get_latest_error_msg(m_mgmsrv));
   ndbout_c("*        %s", ndb_mgm_get_latest_error_desc(m_mgmsrv));
+  if (ndb_mgm_check_connection(m_mgmsrv))
+  {
+    disconnect();
+  }
 }
 
 //*****************************************************************************