diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-07-04 22:45:24 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-07-04 22:45:24 +0200 |
| commit | 8a976f5abe542a6df9a54e29923dc35acec60862 (patch) | |
| tree | afba4681fea807b14088f05623e64db4a7d43e74 | |
| parent | 1b84121688041f80d1fe63e7288842d7033d1cae (diff) | |
| parent | 2088eae27fc8f7f86abad5816d34a574b20aa41a (diff) | |
| download | mariadb-git-8a976f5abe542a6df9a54e29923dc35acec60862.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index e5adcf3f857..efb88bfccd2 100644 --- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -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); |