From: Date: August 29 2006 5:24am
Subject: bk commit into 5.0 tree (gni:1.2250) BUG#19873
List-Archive: http://lists.mysql.com/commits/10972
X-Bug: 19873
Message-Id: <200608290324.k7T3O4Xa012793@dev3-127>

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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@stripped, 2006-08-29 11:22:02+08:00, gni@dev3-127.(none) +1 -0
  BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
  into  dev3-127.(none):/mnt/mysql/home/ngb/bug19873
  MERGE: 1.2216.26.1

  ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2006-08-29 11:22:00+08:00, gni@dev3-127.(none) +1 -1
    ndb_mgm can automatically reconnect to the ndb_mgmd after ndb_mgmd restarted.
    and this commit fixes probable mem leak 
    MERGE: 1.63.4.1

# 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:	gni
# Host:	dev3-127.(none)
# Root:	/mnt/mysql/home/ngb/bug19873/RESYNC

--- 1.68/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-29 11:23:05 +08:00
+++ 1.69/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-29 11:23:05 +08:00
@@ -1028,6 +1028,12 @@
   if (!connect(interactive))
     DBUG_RETURN(true);
 
+  if (ndb_mgm_check_connection(m_mgmsrv))
+  {
+    disconnect();
+    connect();
+  }
+
   if (strcasecmp(firstToken, "SHOW") == 0) {
     Guard g(m_print_mutex);
     executeShow(allAfterFirstToken);
@@ -1640,11 +1646,16 @@
 void
 CommandInterpreter::executeConnect(char* parameters, bool interactive) 
 {
+  BaseString *basestring = NULL;
+
   disconnect();
   if (!emptyString(parameters)) {
-    m_constr= BaseString(parameters).trim().c_str();
+    basestring= new BaseString(parameters);
+    m_constr= basestring->trim().c_str();
   }
-  connect(interactive);
+  connect();
+  if (basestring != NULL)
+    delete basestring;
 }
 
 //*****************************************************************************