summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2007-07-04 22:39:55 +0200
committerjonas@perch.ndb.mysql.com <>2007-07-04 22:39:55 +0200
commitdfcfd6afc416f8996a41b448ecc430152202e175 (patch)
tree627e7b15437826bb9c35aafd6641c29aaf6b3e07
parent71996bd6f415db0ad99ccfb67c8679e8d3f88604 (diff)
downloadmariadb-git-dfcfd6afc416f8996a41b448ecc430152202e175.tar.gz
ndb - bug#29354 - fix bug in bug fix,
dont assert if 2 LCP's are being run during a node recovery
-rw-r--r--ndb/src/kernel/blocks/dblqh/DblqhMain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 7dac07c28e9..1539b726c6a 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -11165,7 +11165,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);