Commit 01a55040 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents 985c1d79 7cbef98e

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+7 −4
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ void Dblqh::execCONTINUEB(Signal* signal) 
    else

    {

      jam();

      cstartRecReq = 2;

      ndbrequire(c_redo_complete_fragments.isEmpty());

      StartRecConf * conf = (StartRecConf*)signal->getDataPtrSend();

      conf->startingNodeId = getOwnNodeId();
@@ -11939,7 +11940,7 @@ void Dblqh::execGCP_SAVEREQ(Signal* signal) 
    return;

  }









  if (getNodeState().getNodeRestartInProgress() && cstartRecReq == ZFALSE)









  if (getNodeState().getNodeRestartInProgress() && cstartRecReq < 2)









  {









    GCPSaveRef * const saveRef = (GCPSaveRef*)&signal->theData[0];









    saveRef->dihPtr = dihPtr;








@@ -14024,7 +14025,7 @@ void Dblqh::execRESTORE_LCP_CONF(Signal* signal)







    return;









  }

















  if (c_lcp_restoring_fragments.isEmpty() && cstartRecReq == ZTRUE)









  if (c_lcp_restoring_fragments.isEmpty() && cstartRecReq == 1)









  {









    jam();









    /* ----------------------------------------------------------------








@@ -14065,7 +14066,7 @@ void Dblqh::execSTART_RECREQ(Signal* signal)







  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;








@@ -14079,6 +14080,7 @@ void Dblqh::execSTART_RECREQ(Signal* signal)







   *------------------------------------------------------------------------ */









  if(cstartType == NodeState::ST_INITIAL_NODE_RESTART){









    jam();









    cstartRecReq = 2;









    StartRecConf * conf = (StartRecConf*)signal->getDataPtrSend();









    conf->startingNodeId = getOwnNodeId();









    sendSignal(cmasterDihBlockref, GSN_START_RECCONF, signal, 








@@ -15900,6 +15902,7 @@ void Dblqh::srFourthComp(Signal* signal)







	return;









      }









    }









    cstartRecReq = 2;









    StartRecConf * conf = (StartRecConf*)signal->getDataPtrSend();









    conf->startingNodeId = getOwnNodeId();









    sendSignal(cmasterDihBlockref, GSN_START_RECCONF, signal, 








@@ -16768,7 +16771,7 @@ void Dblqh::initialiseRecordsLab(Signal* signal, Uint32 data,







    cnoActiveCopy = 0;









    ccurrentGcprec = RNIL;









    caddNodeState = ZFALSE;









    cstartRecReq = ZFALSE;









    cstartRecReq = 0;









    cnewestGci = 0;









    cnewestCompletedGci = 0;









    crestartOldestGci = 0;