diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2007-03-15 13:37:04 +0100 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2007-03-15 13:37:04 +0100 |
commit | e61883c95927ed9bfa8e8bb6960c549a3e63fa10 (patch) | |
tree | 3ab0a847c5819c5bf5ec6cbdc34d5b030d7af971 /storage/ndb/src/kernel/blocks/suma | |
parent | f47ab8cc1d2a1b8a0c39bd152107ae9f68c08409 (diff) | |
parent | c0f28669cb2a58fdc100fc54faab2a57e3a716b7 (diff) | |
download | mariadb-git-e61883c95927ed9bfa8e8bb6960c549a3e63fa10.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/suma/Suma.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
Diffstat (limited to 'storage/ndb/src/kernel/blocks/suma')
-rw-r--r-- | storage/ndb/src/kernel/blocks/suma/Suma.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp index 1e26010ad70..4206613f66e 100644 --- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp +++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp @@ -5001,8 +5001,11 @@ Suma::resend_bucket(Signal* signal, Uint32 buck, Uint32 min_gci, { continue; } + + ndbrequire(sz); + sz --; // remove *len* part of sz - if(sz == 1) + if(sz == 0) { SubGcpCompleteRep * rep = (SubGcpCompleteRep*)signal->getDataPtrSend(); rep->gci = last_gci; |