bk commit into 5.0 tree (jonas:1.2098)

[jonas]

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.2098 06/04/06 16:19:22 jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.29 06/04/06 16:19:19 jonas@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.11 06/04/06 16:19:19 jonas@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.10/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2006-04-06 11:43:28 +02:00
+++ 1.11/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2006-04-06 16:19:19 +02:00
@@ -425,7 +425,7 @@
   Uint16 ccommitFailedNodes[MAX_NDB_NODES];
   
   StopReq c_stopReq;
-  void check_multi_node_shutdown(Signal* signal);
+  bool check_multi_node_shutdown(Signal* signal);
 };
 
 #endif

--- 1.28/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-04-06 11:51:21 +02:00
+++ 1.29/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-04-06 16:19:19 +02:00
@@ -2763,7 +2763,11 @@
   ptrCheckGuard(failedNodePtr, MAX_NODES, nodeRec);
   FailRep* rep = (FailRep*)signal->getDataPtr();
 
-  check_multi_node_shutdown(signal);
+  if (check_multi_node_shutdown(signal))
+  {
+    jam();
+    return;
+  }
   
   if (failedNodePtr.i == getOwnNodeId()) {
     jam();
@@ -2832,8 +2836,8 @@
 			 "We(%u) have been declared dead by %u reason: %s(%u)",
 			 getOwnNodeId(),
 			 refToNode(signal->getSendersBlockRef()),
-			 aFailCause,
-			 msg ? msg : "<Unknown>");
+			 msg ? msg : "<Unknown>",
+			 aFailCause);
     
     progError(__LINE__, code, buf);
     return;
@@ -2893,7 +2897,11 @@
   NodeRecPtr myNodePtr;
   jamEntry();
   
-  check_multi_node_shutdown(signal);
+  if (check_multi_node_shutdown(signal))
+  {
+    jam();
+    return;
+  }
   
   PrepFailReqRef * const prepFail = (PrepFailReqRef *)&signal->theData[0];
 
@@ -4729,7 +4737,7 @@
   }
 }
 
-void
+bool
 Qmgr::check_multi_node_shutdown(Signal* signal)
 {
   if (c_stopReq.senderRef && 
@@ -4745,5 +4753,7 @@
     } else {
       EXECUTE_DIRECT(CMVMI, GSN_STOP_ORD, signal, 1);
     }
+    return true;
   }
+  return false;
 }