Commit d9d1cebb authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
parents a0933646 1be7c06e

ndb/src/common/debugger/EventLogger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ const EventLoggerBase::EventRepLogLevelMatrix EventLoggerBase::matrix[] = { 
  ROW(NDBStopCompleted,        LogLevel::llStartUp,     1, Logger::LL_INFO ),

  ROW(NDBStopForced,           LogLevel::llStartUp,     1, Logger::LL_ALERT ),

  ROW(NDBStopAborted,          LogLevel::llStartUp,     1, Logger::LL_INFO ),

  ROW(StartREDOLog,            LogLevel::llStartUp,    10, Logger::LL_INFO ),

  ROW(StartREDOLog,            LogLevel::llStartUp,     4, Logger::LL_INFO ),

  ROW(StartLog,                LogLevel::llStartUp,    10, Logger::LL_INFO ),

  ROW(UNDORecordsExecuted,     LogLevel::llStartUp,    15, Logger::LL_INFO ),

  ROW(StartReport,             LogLevel::llStartUp,     4, Logger::LL_INFO ),

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

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

    {

      jam();

      cstartRecReq = 2;

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

      conf->startingNodeId = getOwnNodeId();

      sendSignal(cmasterDihBlockref, GSN_START_RECCONF, signal,
@@ -11672,7 +11673,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;








@@ -11949,6 +11950,10 @@ void Dblqh::execFSCLOSECONF(Signal* signal)







    // Set the prev file to check if we shall close it.









    logFilePtr.i = logFilePtr.p->prevLogFile;









    ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);

















    logPartPtr.i = logFilePtr.p->logPartRec;









    ptrCheckGuard(logPartPtr, clogPartFileSize, logPartRecord);

















    exitFromInvalidate(signal);









    return;









  case LogFileRecord::CLOSING_INIT:








@@ -13817,7 +13822,7 @@ void Dblqh::srCompletedLab(Signal* signal)







       *  NO MORE FRAGMENTS ARE WAITING FOR SYSTEM RESTART.









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









      lcpPtr.p->lcpState = LcpRecord::LCP_IDLE;









      if (cstartRecReq == ZTRUE) {









      if (cstartRecReq == 1) {









        jam();









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









         *  WE HAVE ALSO RECEIVED AN INDICATION THAT NO MORE FRAGMENTS 








@@ -13887,7 +13892,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;








@@ -13908,6 +13913,7 @@ void Dblqh::execSTART_RECREQ(Signal* signal)







  }//if









  if(cstartType == NodeState::ST_INITIAL_NODE_RESTART){









    jam();









    cstartRecReq = 2;









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









    conf->startingNodeId = getOwnNodeId();









    sendSignal(cmasterDihBlockref, GSN_START_RECCONF, signal, 








@@ -15728,6 +15734,7 @@ void Dblqh::srFourthComp(Signal* signal)







    else









    {









      jam();









      cstartRecReq = 2;









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









      conf->startingNodeId = getOwnNodeId();









      sendSignal(cmasterDihBlockref, GSN_START_RECCONF, signal, 








@@ -16694,7 +16701,7 @@ void Dblqh::initialiseRecordsLab(Signal* signal, Uint32 data,







    cCommitBlocked = false;









    ccurrentGcprec = RNIL;









    caddNodeState = ZFALSE;









    cstartRecReq = ZFALSE;









    cstartRecReq = 0;









    cnewestGci = (UintR)-1;









    cnewestCompletedGci = (UintR)-1;









    crestartOldestGci = 0;