From: Date: July 15 2005 12:35pm
Subject: bk commit into 4.1 tree (tomas:1.2352) BUG#11132
List-Archive: http://lists.mysql.com/internals/27136
X-Bug: 11132
Message-Id: <20050715103533.AC66B1F3100@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas 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.2352 05/07/15 12:35:26 tomas@stripped +1 -0
  Bug #11132, reverted bug-fix, it introduces another bug.  Ndbd's may get the same nodeid
  
  In 4.1 the connection to the management server _must_ stay, that is how we
  ensure that the nodeids are reserved correctly
  

  ndb/src/common/mgmcommon/ConfigRetriever.cpp
    1.25 05/07/15 12:35:17 tomas@stripped +4 -6
    Bug #11132, reverted bug-fix, it introduces another bug.  Ndbd's may get the same nodeid
    
    In 4.1 the connection to the management server _must_ stay, that is how we
    ensure that the nodeids are reserved correctly
    

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1-release

--- 1.24/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2005-06-15 06:58:45 +02:00
+++ 1.25/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2005-07-15 12:35:17 +02:00
@@ -131,16 +131,14 @@
 }
 
 ndb_mgm_configuration *
-ConfigRetriever::getConfig(NdbMgmHandle m_handle){
-  
+ConfigRetriever::getConfig(NdbMgmHandle m_handle)
+{
   ndb_mgm_configuration * conf = ndb_mgm_get_configuration(m_handle,m_version);
-  if(conf == 0){
+  if(conf == 0)
+  {
     setError(CR_ERROR, ndb_mgm_get_latest_error_desc(m_handle));
     return 0;
   }
-
-  ndb_mgm_disconnect(m_handle);
-
   return conf;
 }