Commit bd720c4d authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work 

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
parents c66b8fcc 31e3e753

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

+1 −3
Original line number Diff line number Diff line
@@ -12555,19 +12555,17 @@ void Dblqh::lastWriteInFileLab(Signal* signal) 








void Dblqh::writePageZeroLab(Signal* signal) 









{









  if (false && logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 









  if (logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 









  {









    if (logPartPtr.p->firstLogQueue == RNIL) 









    {









      jam();









      logPartPtr.p->logPartState = LogPartRecord::IDLE;









      ndbout_c("resetting logPartState to IDLE");









    } 









    else 









    {









      jam();









      logPartPtr.p->logPartState = LogPartRecord::ACTIVE;









      ndbout_c("resetting logPartState to ACTIVE");









    }









  }