bk commit into 5.1 tree (jonas:1.2463) BUG#28023

[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-04-23 15:38:06+02:00, jonas@stripped +2 -0
  ndb -
    add (auto) testcase for bug#28023

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-04-23 15:38:04+02:00,
jonas@stripped +69 -0
    add testcase for bug#28023

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-04-23 15:38:04+02:00,
jonas@stripped +4 -0
    add testcase for bug#28023

# 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-telco-gca

--- 1.70/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-23 15:38:11 +02:00
+++ 1.71/storage/ndb/test/run-test/daily-basic-tests.txt	2007-04-23 15:38:11 +02:00
@@ -473,6 +473,10 @@
 cmd: testNodeRestart
 args: -n Bug27283 T1
 
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug28023 T7 D2
+
 max-time: 500
 cmd: testScan
 args: -n ScanVariants

--- 1.47/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-04-23 15:38:11 +02:00
+++ 1.48/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-04-23 15:38:11 +02:00
@@ -1473,6 +1473,72 @@
   return NDBT_OK;
 }
 
+int
+runBug28023(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+  int records = ctx->getNumRecords();
+  Ndb* pNdb = GETNDB(step);
+  NdbRestarter res;
+
+  if (res.getNumDbNodes() < 2)
+  {
+    return NDBT_OK;
+  }
+
+
+  HugoTransactions hugoTrans(*ctx->getTab());
+  if (hugoTrans.loadTable(pNdb, records) != 0){
+    return NDBT_FAILED;
+  }
+  
+  if (hugoTrans.clearTable(pNdb, records) != 0)
+  {
+    return NDBT_FAILED;
+  }
+
+  for (Uint32 i = 0; i<loops; i++)
+  {
+    int node1 = res.getDbNodeId(rand() % res.getNumDbNodes());
+    
+    if (res.restartOneDbNode2(node1, 
+                              NdbRestarter::NRRF_ABORT |
+                              NdbRestarter::NRRF_NOSTART))
+      return NDBT_FAILED;
+    
+    if (res.waitNodesNoStart(&node1, 1))
+      return NDBT_FAILED;
+
+    if (hugoTrans.loadTable(pNdb, records) != 0){
+      return NDBT_FAILED;
+    }
+    
+    if (hugoTrans.clearTable(pNdb, records) != 0)
+    {
+      return NDBT_FAILED;
+    }
+    
+    res.startNodes(&node1, 1);
+    if (res.waitClusterStarted())
+      return NDBT_FAILED;
+
+    if (hugoTrans.loadTable(pNdb, records) != 0){
+      return NDBT_FAILED;
+    }
+    
+    if (hugoTrans.scanUpdateRecords(pNdb, records) != 0)
+      return NDBT_FAILED;
+
+    if (hugoTrans.clearTable(pNdb, records) != 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 "\
@@ -1826,6 +1892,9 @@
 }
 TESTCASE("Bug27466", ""){
   INITIALIZER(runBug27466);
+}
+TESTCASE("Bug28023", ""){
+  INITIALIZER(runBug28023);
 }
 NDBT_TESTSUITE_END(testNodeRestart);