Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
This commit is contained in:
commit
87675bcdce
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user