bk commit into 5.1 tree (jonas:1.2332) BUG#24105

[jonas]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2006-11-29 13:10:14+01:00, jonas@stripped +1 -0
  ndb - bug#24105
    Handle not started nodes correctly (for X restart)
    i.e dont wait for NF_COMPLETEREP
        but settle with NODEFAIL_REP

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2006-11-29 13:10:12+01:00,
jonas@stripped +17 -0
    Handle not started nodes correctly
    i.e dont wait for NF_COMPLETEREP
        but settle with NODEFAIL_REP

# 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/51-work

--- 1.110/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-11-29 13:10:19 +01:00
+++ 1.111/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-11-29 13:10:19 +01:00
@@ -972,6 +972,15 @@
   StopReq* const stopReq = CAST_PTR(StopReq, ssig.getDataPtrSend());
   ssig.set(ss, TestOrd::TraceAPI, NDBCNTR, GSN_STOP_REQ, StopReq::SignalLength);
 
+  NdbNodeBitmask notstarted;
+  for (Uint32 i = 0; i<node_ids.size(); i++)
+  {
+    Uint32 nodeId = node_ids[i];
+    ClusterMgr::Node node = theFacade->theClusterMgr->getNodeInfo(nodeId);
+    if (node.m_state.startLevel != NodeState::SL_STARTED)
+      notstarted.set(nodeId);
+  }
+  
   stopReq->requestInfo = 0;
   stopReq->apiTimeout = 5000;
   stopReq->transactionTimeout = 1000;
@@ -1142,6 +1151,14 @@
     case GSN_NODE_FAILREP:{
       const NodeFailRep * const rep =
 	CAST_CONSTPTR(NodeFailRep, signal->getDataPtr());
+      NdbNodeBitmask mask;
+      char buf[100];
+      mask.assign(NdbNodeBitmask::Size, rep->theNodes);
+      mask.bitAND(notstarted);
+      nodes.bitANDC(mask);
+      
+      if (singleUserNodeId == 0)
+	stoppedNodes.bitOR(mask);
       break;
     }
     default: