bk commit into 5.1 tree (jonas:1.2450)

[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-02 11:58:00+01:00, jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco
  into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
  MERGE: 1.2429.3.17

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2007-03-02 11:57:56+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.42.1.7

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-03-02 11:57:56+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.106.1.8

  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp@stripped, 2007-03-02 11:57:56+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.28.1.3

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-03-02 11:57:56+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.41.1.6

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-03-02 11:57:56+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.68.1.5

# 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/51-jonas/RESYNC

--- 1.109/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-02 11:58:05 +01:00
+++ 1.110/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-03-02 11:58:05 +01:00
@@ -14233,7 +14233,7 @@
   }
 
   if(arg == DumpStateOrd::EnableUndoDelayDataWrite){
-    g_eventLogger.info("Dbdih:: delay write of datapages for table = %s", 
+    g_eventLogger.info("Dbdih:: delay write of datapages for table = %d", 
                        dumpState->args[1]);
     // Send this dump to ACC and TUP
     EXECUTE_DIRECT(DBACC, GSN_DUMP_STATE_ORD, signal, 2);

--- 1.44/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-02 11:58:05 +01:00
+++ 1.45/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-02 11:58:05 +01:00
@@ -1353,6 +1353,68 @@
   return NDBT_OK;
 }
 
+int 
+runBug26450(NDBT_Context* ctx, NDBT_Step* step)
+{
+  Uint32 i;
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+  int records = ctx->getNumRecords();
+  NdbRestarter res;
+  Ndb* pNdb = GETNDB(step);
+  
+  int node = res.getRandomNotMasterNodeId(rand());
+  Vector<int> nodes;
+  for (unsigned i = 0; i<res.getNumDbNodes(); i++)
+  {
+    if (res.getDbNodeId(i) != node)
+      nodes.push_back(res.getDbNodeId(i));
+  }
+  
+  if (res.restartAll())
+    return NDBT_FAILED;
+
+  if (res.waitClusterStarted())
+    return NDBT_FAILED;
+
+  ndbout_c("node: %d", node);
+  if (res.restartOneDbNode(node, false, true, true))
+    return NDBT_FAILED;
+  
+  if (res.waitNodesNoStart(&node, 1))
+    return NDBT_FAILED;
+
+  if (runClearTable(ctx, step))
+    return NDBT_FAILED;
+
+  for (i = 0; i < 2; i++)
+  {
+    if (res.restartAll(false, true, i > 0))
+      return NDBT_FAILED;
+    
+    if (res.waitClusterNoStart())
+      return NDBT_FAILED;
+    
+    if (res.startNodes(nodes.getBase(), nodes.size()))
+      return NDBT_FAILED;
+
+    if (res.waitNodesStarted(nodes.getBase(), nodes.size()))
+      return NDBT_FAILED;
+  }
+
+  if (res.startNodes(&node, 1))
+    return NDBT_FAILED;
+
+  if (res.waitNodesStarted(&node, 1))
+    return NDBT_FAILED;
+
+  HugoTransactions trans (* ctx->getTab());
+  if (trans.selectCount(pNdb) != 0)
+    return NDBT_FAILED;
+
+  return NDBT_OK;
+}
+
 NDBT_TESTSUITE(testNodeRestart);
 TESTCASE("NoLoad", 
 	 "Test that one node at a time can be stopped and then restarted "\
@@ -1696,6 +1758,10 @@
 }
 TESTCASE("Bug26481", ""){
   INITIALIZER(runBug26481);
+}
+TESTCASE("Bug26450", ""){
+  INITIALIZER(runLoadTable);
+  INITIALIZER(runBug26450);
 }
 NDBT_TESTSUITE_END(testNodeRestart);