From: Date: February 22 2007 3:02pm
Subject: bk commit into 5.1 tree (jonas:1.2420) BUG#26481
List-Archive: http://lists.mysql.com/commits/20360
X-Bug: 26481
Message-Id: <20070222140258.394F7424970@eel.mysql.com>

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, 2007-02-22 15:02:48+01:00, jonas@eel.(none) +1 -0
  ndb - bug#26481 - fix of bug fix
    Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...START_RECREQ is not enough
  

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-22 15:02:42+01:00, jonas@eel.(none) +7 -4
    Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...
    START_RECREQ is not enough
    

# 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:	eel.(none)
# Root:	/home/jonas/src/51-work

--- 1.132/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-22 15:02:57 +01:00
+++ 1.133/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-22 15:02:58 +01:00
@@ -440,6 +440,7 @@
     else
     {
       jam();
+      cstartRecReq = 2;
       ndbrequire(c_redo_complete_fragments.isEmpty());
       StartRecConf * conf = (StartRecConf*)signal->getDataPtrSend();
       conf->startingNodeId = getOwnNodeId();
@@ -11893,7 +11894,7 @@
     return;
   }
 
-  if (getNodeState().getNodeRestartInProgress() && cstartRecReq == ZFALSE)
+  if (getNodeState().getNodeRestartInProgress() && cstartRecReq < 2)
   {
     GCPSaveRef * const saveRef = (GCPSaveRef*)&signal->theData[0];
     saveRef->dihPtr = dihPtr;
@@ -13978,7 +13979,7 @@
     return;
   }
 
-  if (c_lcp_restoring_fragments.isEmpty() && cstartRecReq == ZTRUE)
+  if (c_lcp_restoring_fragments.isEmpty() && cstartRecReq == 1)
   {
     jam();
     /* ----------------------------------------------------------------
@@ -14019,7 +14020,7 @@
   ndbrequire(req->receivingNodeId == cownNodeid);
 
   cnewestCompletedGci = cnewestGci;
-  cstartRecReq = ZTRUE;
+  cstartRecReq = 1;
   for (logPartPtr.i = 0; logPartPtr.i < 4; logPartPtr.i++) {
     ptrAss(logPartPtr, logPartRecord);
     logPartPtr.p->logPartNewestCompletedGCI = cnewestCompletedGci;
@@ -14033,6 +14034,7 @@
    *------------------------------------------------------------------------ */
   if(cstartType == NodeState::ST_INITIAL_NODE_RESTART){
     jam();
+    cstartRecReq = 2;
     StartRecConf * conf = (StartRecConf*)signal->getDataPtrSend();
     conf->startingNodeId = getOwnNodeId();
     sendSignal(cmasterDihBlockref, GSN_START_RECCONF, signal, 
@@ -15856,6 +15858,7 @@
 	return;
       }
     }
+    cstartRecReq = 2;
     StartRecConf * conf = (StartRecConf*)signal->getDataPtrSend();
     conf->startingNodeId = getOwnNodeId();
     sendSignal(cmasterDihBlockref, GSN_START_RECCONF, signal, 
@@ -16724,7 +16727,7 @@
     cnoActiveCopy = 0;
     ccurrentGcprec = RNIL;
     caddNodeState = ZFALSE;
-    cstartRecReq = ZFALSE;
+    cstartRecReq = 0;
     cnewestGci = 0;
     cnewestCompletedGci = 0;
     crestartOldestGci = 0;