bk commit into 5.1 tree (jonas:1.2581)

[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-09-28 10:00:47+02:00, jonas@stripped +10 -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.81

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.37.1.2

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -32
    Auto merged
    MERGE: 1.37.1.8

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -1
    Auto merged
    MERGE: 1.131.1.6

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -24
    Auto merged
    MERGE: 1.20.1.8

  storage/ndb/test/include/HugoTransactions.hpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -18
    Auto merged
    MERGE: 1.15.1.1

  storage/ndb/test/include/UtilTransactions.hpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -5
    Auto merged
    MERGE: 1.9.1.1

  storage/ndb/test/ndbapi/testSystemRestart.cpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -154
    Auto merged
    MERGE: 1.13.1.1

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -32
    Auto merged
    MERGE: 1.61.1.18

  storage/ndb/test/src/HugoTransactions.cpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -83
    Auto merged
    MERGE: 1.32.1.2

  storage/ndb/test/src/UtilTransactions.cpp@stripped, 2007-09-28 10:00:43+02:00, jonas@stripped +0 -41
    Auto merged
    MERGE: 1.25.1.1

# 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.40/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2007-09-28 10:00:52 +02:00
+++ 1.41/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2007-09-28 10:00:52 +02:00
@@ -6,7 +6,7 @@
 Next DBLQH 5048
 Next DBDICT 6007
 Next DBDIH 7186
-Next DBTC 8040
+Next DBTC 8054
 Next CMVMI 9000
 Next BACKUP 10038
 Next DBUTIL 11002
@@ -249,6 +249,8 @@
 Delay execution of ABORTCONF signal 2 seconds to generate time-out.
 
 8050: Send ZABORT_TIMEOUT_BREAK delayed
+
+8053: Crash in timeOutFoundLab, state CS_WAIT_COMMIT_CONF
 
 ERROR CODES FOR TESTING TIME-OUT HANDLING IN DBTC
 -------------------------------------------------

--- 1.16/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-09-28 10:00:52 +02:00
+++ 1.17/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-09-28 10:00:52 +02:00
@@ -1595,6 +1595,32 @@
   STEP(runBug24664);
   FINALIZER(runClearTable);
 }
+TESTCASE("SR_DD_1", "")
+{
+  INITIALIZER(runWaitStarted);
+  STEP(runSR_DD_1);
+  FINALIZER(runClearTable);
+}
+TESTCASE("SR_DD_1_LCP", "")
+{
+  TC_PROPERTY("LCP", 1);
+  INITIALIZER(runWaitStarted);
+  STEP(runSR_DD_1);
+  FINALIZER(runClearTable);
+}
+TESTCASE("SR_DD_2", "")
+{
+  INITIALIZER(runWaitStarted);
+  STEP(runSR_DD_2);
+  FINALIZER(runClearTable);
+}
+TESTCASE("SR_DD_2_LCP", "")
+{
+  TC_PROPERTY("LCP", 1);
+  INITIALIZER(runWaitStarted);
+  STEP(runSR_DD_2);
+  FINALIZER(runClearTable);
+}
 TESTCASE("Bug29167", "")
 {
   INITIALIZER(runWaitStarted);