diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-07-04 22:41:41 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-07-04 22:41:41 +0200 |
| commit | 2088eae27fc8f7f86abad5816d34a574b20aa41a (patch) | |
| tree | c54cfd6f97fd6e6a66eb17d368109202996479c9 /storage | |
| parent | aa1d69a8d94464c99304345d5140bd588fde39ee (diff) | |
| parent | a3cd95eef89ed4c7715d1a83e27e0923e643942f (diff) | |
| download | mariadb-git-2088eae27fc8f7f86abad5816d34a574b20aa41a.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
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
Diffstat (limited to 'storage')
| -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); |