mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
This commit is contained in:
commit
2088eae27f
1 changed files with 1 additions and 1 deletions
|
@ -11795,7 +11795,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…
Reference in a new issue