diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-01-22 17:16:36 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-01-22 17:16:36 +0100 |
| commit | 93c0d6d220f0144b1463f1f5f5e28b496c8cdc6f (patch) | |
| tree | de5dcaf38bc2c3584367511a41f9087662b50553 /storage | |
| parent | dc635e5918db1ffc8b02f8a4649cc337e47d1531 (diff) | |
| parent | 448edca9accca0d8f40cce548abe8363d06c21b4 (diff) | |
| download | mariadb-git-93c0d6d220f0144b1463f1f5f5e28b496c8cdc6f.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp index a2c53d96328..3a6f5151fec 100644 --- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp +++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp @@ -2827,7 +2827,8 @@ Qmgr::sendVersionedDb(NodeReceiverGroup rg, sendSignal(numberToRef(rg.m_block, i), gsn, signal, length, jbuf); } } - ndbassert(cnt < rg.m_nodes.count()); + ndbassert((cnt == 0 && rg.m_nodes.count() == 0) || + (cnt < rg.m_nodes.count())); } } |