bk commit into 5.1 tree (jonas:1.2604)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-11 09:30:10+01:00, jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
  into  perch.ndb.mysql.com:/home/jonas/src/telco-6.1
  MERGE: 1.2403.9.100

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2008-01-11 09:30:08+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.37.1.5

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2008-01-11 09:30:08+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.50.1.11

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2008-01-11 09:30:08+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.61.1.22

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/telco-6.1/RESYNC

--- 1.88/storage/ndb/test/run-test/daily-basic-tests.txt	2008-01-11 09:30:13 +01:00
+++ 1.89/storage/ndb/test/run-test/daily-basic-tests.txt	2008-01-11 09:30:13 +01:00
@@ -950,3 +950,7 @@
 cmd: test_event
 args: -n Bug31701 T1
 
+max-time: 300
+cmd: test_event
+args: -n Bug33793 T1
+

--- 1.43/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2008-01-11 09:30:13 +01:00
+++ 1.44/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2008-01-11 09:30:13 +01:00
@@ -11,7 +11,7 @@
 Next BACKUP 10038
 Next DBUTIL 11002
 Next DBTUX 12008
-Next SUMA 13034
+Next SUMA 13036
 
 TESTING NODE FAILURE, ARBITRATION
 ---------------------------------

--- 1.62/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2008-01-11 09:30:13 +01:00
+++ 1.63/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2008-01-11 09:30:13 +01:00
@@ -4851,6 +4851,21 @@
     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;
@@ -4922,7 +4937,6 @@
 
   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 ++;