Commit 21da0d21 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 446e3272 dfcfd6af

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

+1 −1
Original line number Diff line number Diff line
@@ -11158,7 +11158,7 @@ void Dblqh::sendLCP_COMPLETE_REP(Signal* signal, Uint32 lcpId) 
    sendEMPTY_LCP_CONF(signal, true);

  }









  if (getNodeState().getNodeRestartInProgress())









  if (getNodeState().getNodeRestartInProgress() && cstartRecReq != 3)









  {









    jam();









    ndbrequire(cstartRecReq == 2);