bk commit into 5.1 tree (jonas:1.2701)

[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-12-03 07:31:50+01:00, jonas@stripped +2 -0
  ndb - xmas
    remove "testNodeRestart -n Bug31525 T1" as code path that it tested is removed

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-12-03 07:31:48+01:00, jonas@stripped +0 -77
    remove removed testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-12-03 07:31:48+01:00, jonas@stripped +0 -4
    remove removed testcase

diff -Nrup a/storage/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-11-23 13:50:41 +01:00
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-12-03 07:31:48 +01:00
@@ -1870,80 +1870,6 @@ runGCP(NDBT_Context* ctx, NDBT_Step* ste
 }
 
 int
-runBug31525(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;
-  }
-
-  int nodes[2];
-  nodes[0] = res.getMasterNodeId();
-  nodes[1] = res.getNextMasterNodeId(nodes[0]);
-  
-  while (res.getNodeGroup(nodes[0]) != res.getNodeGroup(nodes[1]))
-  {
-    ndbout_c("Restarting %u as it not in same node group as %u",
-             nodes[1], nodes[0]);
-    if (res.restartOneDbNode(nodes[1], false, true, true))
-      return NDBT_FAILED;
-    
-    if (res.waitNodesNoStart(nodes+1, 1))
-      return NDBT_FAILED;
-    
-    if (res.startNodes(nodes+1, 1))
-      return NDBT_FAILED;
-    
-    if (res.waitClusterStarted())
-      return NDBT_FAILED;
-
-    nodes[1] = res.getNextMasterNodeId(nodes[0]);
-  }
-  
-  ndbout_c("nodes[0]: %u nodes[1]: %u", nodes[0], nodes[1]);
-  
-  int val = DumpStateOrd::DihMinTimeBetweenLCP;
-  if (res.dumpStateAllNodes(&val, 1))
-    return NDBT_FAILED;
-
-  int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };  
-  if (res.dumpStateAllNodes(val2, 2))
-    return NDBT_FAILED;
-  
-  if (res.insertErrorInAllNodes(932))
-    return NDBT_FAILED;
-
-  if (res.insertErrorInNode(nodes[1], 7192))
-    return NDBT_FAILED;
-  
-  if (res.insertErrorInNode(nodes[0], 7191))
-    return NDBT_FAILED;
-  
-  if (res.waitClusterNoStart())
-    return NDBT_FAILED;
-
-  if (res.startAll())
-    return NDBT_FAILED;
-  
-  if (res.waitClusterStarted())
-    return NDBT_FAILED;
-
-  if (res.restartOneDbNode(nodes[1], false, false, true))
-    return NDBT_FAILED;
-
-  if (res.waitClusterStarted())
-    return NDBT_FAILED;
-  
-  return NDBT_OK;
-}
-
-int
 runBug31980(NDBT_Context* ctx, NDBT_Step* step)
 {
   int result = NDBT_OK;
@@ -2456,9 +2382,6 @@ TESTCASE("Bug21271",
   STEP(runBug21271);
   STEP(runPkUpdateUntilStopped);
   FINALIZER(runClearTable);
-}
-TESTCASE("Bug31525", ""){
-  INITIALIZER(runBug31525);
 }
 TESTCASE("Bug24717", ""){
   INITIALIZER(runBug24717);
diff -Nrup a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt
--- a/storage/ndb/test/run-test/daily-basic-tests.txt	2007-11-30 17:40:38 +01:00
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt	2007-12-03 07:31:48 +01:00
@@ -1070,10 +1070,6 @@ max-time: 1500
 cmd: testSystemRestart
 args: -n SR_DD_2b_LCP D2
 
-max-time: 600
-cmd: testNodeRestart
-args: -n Bug31525 T1
-
 max-time: 300
 cmd: test_event
 args: -n Bug31701 T1