bk commit into 5.1 tree (jonas:1.2109) BUG#15587

[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, 2007-03-06 11:04:00+01:00, jonas@stripped +2 -0
  ndb - wl2325-5.0
  bug#15587 fix incorrect merge (test prg only)

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-03-06 11:03:58+01:00, jonas@stripped +1 -0
    bug#15587 fix incorrect merge

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-03-06 11:03:58+01:00, jonas@stripped +8 -0
    bug#15587 fix incorrect merge

# 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/drop5

--- 1.42/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2007-03-06 11:04:04 +01:00
+++ 1.43/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2007-03-06 11:04:04 +01:00
@@ -2894,6 +2894,7 @@
   UintR ctransidHash[1024];
   
   Uint32 c_diskless;
+  Uint32 c_error_insert_table_id;
   
 public:
   /**

--- 1.91/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-03-06 11:04:04 +01:00
+++ 1.92/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-03-06 11:04:04 +01:00
@@ -3593,6 +3593,7 @@
     jam();
     regTcPtr->activeCreat = ZTRUE;
     CRASH_INSERTION(5002);
+    CRASH_INSERTION2(5042, tabptr.i == c_error_insert_table_id);
   } else {
     regTcPtr->activeCreat = ZFALSE;
   }//if
@@ -19193,6 +19194,13 @@
 			   tcRec.p->transid[0], tcRec.p->transid[1], key.c_str());
       infoEvent(buf);
     }
+  }
+
+  if (dumpState->args[0] == DumpStateOrd::LqhErrorInsert5042 && 
+      signal->getLength() == 2)
+  {
+    c_error_insert_table_id = dumpState->args[1];
+    SET_ERROR_INSERT_VALUE(5042);
   }
 }//Dblqh::execDUMP_STATE_ORD()