List:Commits« Previous MessageNext Message »
From:jonas oreland Date:January 19 2011 6:41pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:4135 to 4136)
View as plain text  
 4136 jonas oreland	2011-01-19
      ndb - make sure only datanodes are sent as active

    modified:
      storage/ndb/src/ndbapi/ClusterMgr.cpp
 4135 Ole John Aske	2011-01-18
      Resultfile needed update after commit of fix for bug#59519.
     @ mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result
        As 'rec_per_key[]= 1' is no longer set for non-unique index we don't have available 'Cardinality' statistics for ordered indexes. Thus the change of 'Cardinality' from '0' to NULL (unknown) for the above results.

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result
=== modified file 'storage/ndb/src/ndbapi/ClusterMgr.cpp'
--- a/storage/ndb/src/ndbapi/ClusterMgr.cpp	2011-01-18 08:16:08 +0000
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp	2011-01-19 18:41:30 +0000
@@ -735,12 +735,21 @@ ClusterMgr::execAPI_REGCONF(const NdbApi
     memcpy(&node.m_state, &apiRegConf->nodeState, sizeof(node.m_state) - 24);
   }
   
-  if (node.compatible && (node.m_state.startLevel == NodeState::SL_STARTED  ||
-			  node.m_state.getSingleUserMode())){
-    set_node_alive(node, true);
-  } else {
-    set_node_alive(node, false);
-  }//if
+  if (node.m_info.m_type == NodeInfo::DB)
+  {
+    /**
+     * Only set DB nodes to "alive"
+     */
+    if (node.compatible && (node.m_state.startLevel == NodeState::SL_STARTED ||
+                            node.m_state.getSingleUserMode()))
+    {
+      set_node_alive(node, true);
+    }
+    else
+    {
+      set_node_alive(node, false);
+    }
+  }
 
   cm_node.hbMissed = 0;
   cm_node.hbCounter = 0;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:4135 to 4136) jonas oreland19 Jan