From: Date: January 13 2006 7:40am
Subject: bk commit into 5.0 tree (jonas:1.1979) BUG#15619
List-Archive: http://lists.mysql.com/commits/1022
X-Bug: 15619
Message-Id: <20060113064020.906422249A7@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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.1979 06/01/13 07:40:15 jonas@stripped +1 -0
  bug#15619 - ndb_autodiscover sometimes fails

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.92 06/01/13 07:40:13 jonas@stripped +10 -0
    Make sure that node allocating id is allowed to transporter connect

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-work

--- 1.91/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-10-13 16:38:30 +02:00
+++ 1.92/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-01-13 07:40:13 +01:00
@@ -1868,6 +1868,16 @@
 	m_connect_address[id_found].s_addr= 0;
     }
     m_reserved_nodes.set(id_found);
+    if (theFacade && id_found != theFacade->ownId())
+    {
+      /**
+       * Make sure we're ready to accept connections from this node
+       */
+      theFacade->lock_mutex();
+      theFacade->doConnect(id_found);
+      theFacade->unlock_mutex();
+    }
+    
     char tmp_str[128];
     m_reserved_nodes.getText(tmp_str);
     g_eventLogger.info("Mgmt server state: nodeid %d reserved for ip %s, m_reserved_nodes %s.",