bk commit into 5.0 tree (jonas:1.2091)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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
  1.2091 06/03/23 15:47:01 jonas@stripped +4 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/41-work
  into  perch.ndb.mysql.com:/home/jonas/src/50-work

  ndb/test/run-test/daily-basic-tests.txt
    1.36 06/03/23 15:46:57 jonas@stripped +0 -0
    Auto merged

  ndb/test/ndbapi/testNodeRestart.cpp
    1.19 06/03/23 15:46:57 jonas@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.86 06/03/23 15:46:57 jonas@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/ERROR_codes.txt
    1.17 06/03/23 15:46:57 jonas@stripped +0 -0
    Auto merged

# 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/50-work/RESYNC

--- 1.35/ndb/test/run-test/daily-basic-tests.txt	2006-03-22 15:24:29 +01:00
+++ 1.36/ndb/test/run-test/daily-basic-tests.txt	2006-03-23 15:46:57 +01:00
@@ -429,10 +429,10 @@
 cmd: testNodeRestart
 args: -n Bug16772 T1
 
-max-time: 500
-cmd: testSystemRestart
-args: -n Bug18385 T1
-
+#max-time: 500
+#cmd: testSystemRestart
+#args: -n Bug18385 T1
+#
 max-time: 500
 cmd: testNodeRestart
 args: -n Bug18414 T1

--- 1.16/ndb/src/kernel/blocks/ERROR_codes.txt	2006-03-22 15:10:34 +01:00
+++ 1.17/ndb/src/kernel/blocks/ERROR_codes.txt	2006-03-23 15:46:57 +01:00
@@ -318,7 +318,7 @@
 5026  Crash when receiving COPY_ACTIVEREQ
 5027  Crash when receiving STAT_RECREQ
 
-5042  Crash starting node, when scan is finished on primary replica
+5043  Crash starting node, when scan is finished on primary replica
 
 Test Crashes in handling take over
 ----------------------------------

--- 1.85/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-03-22 15:46:48 +01:00
+++ 1.86/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-03-23 15:46:57 +01:00
@@ -9265,7 +9265,7 @@
 /*---------------------------------------------------------------------------*/
     scanptr.p->scanCompletedStatus = ZTRUE;
     scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY;
-    if (ERROR_INSERTED(5042))
+    if (ERROR_INSERTED(5043))
     {
       CLEAR_ERROR_INSERT_VALUE;
       tcConnectptr.p->copyCountWords = ~0;

--- 1.18/ndb/test/ndbapi/testNodeRestart.cpp	2006-03-22 15:10:35 +01:00
+++ 1.19/ndb/test/ndbapi/testNodeRestart.cpp	2006-03-23 15:46:57 +01:00
@@ -439,6 +439,14 @@
   if (restarter.startNodes(&nodeId, 1))
     return NDBT_FAILED;
 
+  restarter.waitNodesStartPhase(&nodeId, 1, 3);
+  
+  if (restarter.waitNodesNoStart(&nodeId, 1))
+    return NDBT_FAILED; 
+   
+  if (restarter.startNodes(&nodeId, 1))
+    return NDBT_FAILED;
+  
   if (restarter.waitNodesStarted(&nodeId, 1))
     return NDBT_FAILED;