diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-07-04 22:42:31 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-07-04 22:42:31 +0200 |
| commit | 87675bcdce5fa17d428fabe278d0526cd623451f (patch) | |
| tree | e3a07cc8af3d92d07b1da7843e9a5d65b91e403d /ndb | |
| parent | 2a511057fe6a069e5cd08a82eefe260da07bf1b0 (diff) | |
| parent | 7ebebf5e273056013a6c25ee474755000569f867 (diff) | |
| download | mariadb-git-87675bcdce5fa17d428fabe278d0526cd623451f.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 2 |
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 9281b787008..e4ff1d1dbb6 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -11158,7 +11158,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); |