diff options
| author | jonas@perch.ndb.mysql.com <> | 2007-07-04 22:41:41 +0200 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2007-07-04 22:41:41 +0200 |
| commit | 6a6e87fd2e1b260d5bf28b64d6a5779720422931 (patch) | |
| tree | c54cfd6f97fd6e6a66eb17d368109202996479c9 | |
| parent | 6d10d4592a90ec64d7ae6ffea2f45853a34cd0d6 (diff) | |
| parent | 42000d3fbeffcd4f906f29fdfacb4a95f4983ef8 (diff) | |
| download | mariadb-git-6a6e87fd2e1b260d5bf28b64d6a5779720422931.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
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); |