Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb

1 files changed, 7 insertions, 1 deletions

diff --git a/ndb/src/ndbapi/ClusterMgr.cpp b/ndb/src/ndbapi/ClusterMgr.cpp
index 41ae532164b..183cb6488f8 100644
--- a/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/ndb/src/ndbapi/ClusterMgr.cpp
@@ -410,7 +410,13 @@ ClusterMgr::reportConnected(NodeId nodeId){
   theNode.connected = true;
   theNode.hbSent = 0;
   theNode.hbCounter = 0;
-  
+
+  /**
+   * make sure the node itself is marked connected even
+   * if first API_REGCONF has not arrived
+   */
+  theNode.m_state.m_connected_nodes.set(nodeId);
+
   if (theNode.m_info.m_type != NodeInfo::REP) {
     theNode.hbFrequency = 0;
   }