diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2008-01-11 09:31:55 +0100 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2008-01-11 09:31:55 +0100 |
commit | b64f9dbe155e713c1f801b6ee4d114b09ce2b610 (patch) | |
tree | 4bf179442d9fb6dc675e2d062f175d17fc4cbaa0 /storage/ndb/src/kernel/blocks/suma | |
parent | d4045eedd818fd4b9ae93885091091e384fc5932 (diff) | |
parent | e984956385c6ee6370da97655bc217070558fbb1 (diff) | |
download | mariadb-git-b64f9dbe155e713c1f801b6ee4d114b09ce2b610.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 | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp index 113b63a19d3..5f0510cf43a 100644 --- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp +++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp @@ -4908,6 +4908,21 @@ Suma::release_gci(Signal* signal, Uint32 buck, Uint32 gci) if(gci >= head.m_max_gci) { jam(); + if (ERROR_INSERTED(13034)) + { + jam(); + SET_ERROR_INSERT_VALUE(13035); + return; + } + if (ERROR_INSERTED(13035)) + { + CLEAR_ERROR_INSERT_VALUE; + NodeReceiverGroup rg(CMVMI, c_nodes_in_nodegroup_mask); + rg.m_nodes.clear(getOwnNodeId()); + signal->theData[0] = 9999; + sendSignal(rg, GSN_NDB_TAMPER, signal, 1, JBA); + return; + } head.m_page_pos = 0; head.m_max_gci = gci; head.m_last_gci = 0; @@ -4979,7 +4994,6 @@ Suma::start_resend(Signal* signal, Uint32 buck) if(min > max) { - ndbrequire(pos.m_page_pos <= 2); ndbrequire(pos.m_page_id == bucket->m_buffer_tail); m_active_buckets.set(buck); m_gcp_complete_rep_count ++; |