bk commit into 5.0 tree (tomas:1.1774)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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.1774 05/03/04 09:55:16 tomas@stripped +2 -0
  get connected nodes correct earlier for correct node id allocation

  ndb/src/ndbapi/ClusterMgr.cpp
    1.17 05/03/04 09:55:12 tomas@stripped +4 -0
    get connected nodes correct earlier for correct node id allocation

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.72 05/03/04 09:55:12 tomas@stripped +3 -1
    get connected nodes correct earlier for correct node id allocation

# 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-5.0-ndb

--- 1.71/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-02-24 06:21:51 +01:00
+++ 1.72/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-03-04 09:55:12 +01:00
@@ -55,6 +55,7 @@
 #include <mgmapi_configuration.hpp>
 #include <mgmapi_config_parameters.h>
 #include <m_string.h>
+#include <Transporter.hpp>
 
 //#define MGM_SRV_DEBUG
 #ifdef MGM_SRV_DEBUG
@@ -2138,9 +2139,10 @@
       if (getNodeType(i) == NDB_MGM_NODE_TYPE_NDB)
       {
 	const ClusterMgr::Node &node= theFacade->theClusterMgr->getNodeInfo(i);
-	if (node.connected)
+	if (theFacade->get_registry()->get_transporter(i)->isConnected())
 	{
 	  connected_nodes.bitOR(node.m_state.m_connected_nodes);
+	  connected_nodes.set(i);
 	}
       }
     }

--- 1.16/ndb/src/ndbapi/ClusterMgr.cpp	2005-02-14 15:51:39 +01:00
+++ 1.17/ndb/src/ndbapi/ClusterMgr.cpp	2005-03-04 09:55:12 +01:00
@@ -260,6 +260,7 @@
   : m_state(NodeState::SL_NOTHING) { 
   compatible = nfCompleteRep = true;
   connected = defined = m_alive = false; 
+  m_state.m_connected_nodes.clear();
 }
 
 /******************************************************************************
@@ -434,6 +435,9 @@
 
   noOfConnectedNodes--;
   theNodes[nodeId].connected = false;
+
+  theNodes[nodeId].m_state.m_connected_nodes.clear();
+
   reportNodeFailed(nodeId);
 }