diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2007-10-19 21:25:07 +0200 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2007-10-19 21:25:07 +0200 |
commit | 406e1433044fded5a995916eeba5f17b5f6b07e9 (patch) | |
tree | ff19fd7cca4685a8243d5ae589fcfd9a3f088aca /storage/ndb/src/kernel/blocks/suma | |
parent | e8c4a6ba9f430dc4494c4869258321bebb02db04 (diff) | |
parent | 78951216ff29b017e3cb98ecb34c954090beb020 (diff) | |
download | mariadb-git-406e1433044fded5a995916eeba5f17b5f6b07e9.tar.gz |
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
Diffstat (limited to 'storage/ndb/src/kernel/blocks/suma')
-rw-r--r-- | storage/ndb/src/kernel/blocks/suma/Suma.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp index b8cc438f514..7845b83693c 100644 --- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp +++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp @@ -3655,6 +3655,8 @@ Suma::execSUB_GCP_COMPLETE_REP(Signal* signal) if(m_gcp_complete_rep_count && !c_subscriber_nodes.isclear()) { + CRASH_INSERTION(13033); + NodeReceiverGroup rg(API_CLUSTERMGR, c_subscriber_nodes); sendSignal(rg, GSN_SUB_GCP_COMPLETE_REP, signal, SubGcpCompleteRep::SignalLength, JBB); @@ -3674,8 +3676,8 @@ Suma::execSUB_GCP_COMPLETE_REP(Signal* signal) { if(m_active_buckets.get(i)) continue; - - if(c_buckets[i].m_buffer_tail != RNIL) + + if (!c_subscriber_nodes.isclear()) { //Uint32* dst; get_buffer_ptr(signal, i, gci, 0); |