List:Commits« Previous MessageNext Message »
From:Magnus Svensson Date:October 27 2008 9:19am
Subject:bzr commit into mysql-5.1 branch (msvensson:2884) WL#4350
View as plain text  
#At file:///home/msvensson/mysql/6.4-wl4350/

 2884 Magnus Svensson	2008-10-27
      WL#4350 
       - TransporterFacade::ge_an_alive_node should only return alive NDB nodes
modified:
  storage/ndb/src/ndbapi/TransporterFacade.cpp

=== modified file 'storage/ndb/src/ndbapi/TransporterFacade.cpp'
--- a/storage/ndb/src/ndbapi/TransporterFacade.cpp	2008-10-21 12:41:59 +0000
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp	2008-10-27 09:19:44 +0000
@@ -1675,14 +1675,14 @@ TransporterFacade::get_an_alive_node()
 #endif
   NodeId i;
   for (i = theStartNodeId; i < MAX_NDB_NODES; i++) {
-    if (get_node_alive(i)){
+    if (getIsDbNode(i) && get_node_alive(i)){
       DBUG_PRINT("info", ("Node %d is alive", i));
       theStartNodeId = ((i + 1) % MAX_NDB_NODES);
       DBUG_RETURN(i);
     }
   }
   for (i = 1; i < theStartNodeId; i++) {
-    if (get_node_alive(i)){
+    if (getIsDbNode(i) && get_node_alive(i)){
       DBUG_PRINT("info", ("Node %d is alive", i));
       theStartNodeId = ((i + 1) % MAX_NDB_NODES);
       DBUG_RETURN(i);

Thread
bzr commit into mysql-5.1 branch (msvensson:2884) WL#4350Magnus Svensson27 Oct