bk commit into 5.1 tree (jonas:1.2686)

[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-11-19 12:54:09+01:00, jonas@stripped +1 -0
  merge error

  storage/ndb/test/ndbapi/testSystemRestart.cpp@stripped, 2007-11-19 12:54:07+01:00, jonas@stripped +0 -48
    merge error

diff -Nrup a/storage/ndb/test/ndbapi/testSystemRestart.cpp b/storage/ndb/test/ndbapi/testSystemRestart.cpp
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-11-19 11:04:22 +01:00
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-11-19 12:54:07 +01:00
@@ -1580,54 +1580,6 @@ int runBug22696(NDBT_Context* ctx, NDBT_
   return result;
 }
 
-int 
-runBug27434(NDBT_Context* ctx, NDBT_Step* step)
-{
-  int result = NDBT_OK;
-  NdbRestarter restarter;
-  Ndb* pNdb = GETNDB(step);
-  const Uint32 nodeCount = restarter.getNumDbNodes();
-
-  if (nodeCount < 2)
-    return NDBT_OK;
-
-  int args[] = { DumpStateOrd::DihMaxTimeBetweenLCP };
-  int dump[] = { DumpStateOrd::DihStartLcpImmediately };
-
-  int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT, 0 };
-  NdbLogEventHandle handle = 
-    ndb_mgm_create_logevent_handle(restarter.handle, filter);
-
-  struct ndb_logevent event;
-
-  do {
-    int node1 = restarter.getDbNodeId(rand() % nodeCount);
-    CHECK(restarter.restartOneDbNode(node1, false, true, true) == 0);
-    NdbSleep_SecSleep(3);
-    CHECK(restarter.waitNodesNoStart(&node1, 1) == 0);
-
-    CHECK(restarter.dumpStateAllNodes(args, 1) == 0);
-
-    for (Uint32 i = 0; i<3; i++)
-    {
-      CHECK(restarter.dumpStateAllNodes(dump, 1) == 0);
-      while(ndb_logevent_get_next(handle, &event, 0) >= 0 &&
-	    event.type != NDB_LE_LocalCheckpointStarted);
-      while(ndb_logevent_get_next(handle, &event, 0) >= 0 &&
-	    event.type != NDB_LE_LocalCheckpointCompleted);
-    }      
-    
-    restarter.restartAll(false, true, true);
-    NdbSleep_SecSleep(3);
-    CHECK(restarter.waitClusterNoStart() == 0);
-    restarter.insertErrorInNode(node1, 5046);
-    restarter.startAll();
-    CHECK(restarter.waitClusterStarted() == 0);
-  } while(false);
-  
-  return result;
-}
-
 NDBT_TESTSUITE(testSystemRestart);
 TESTCASE("SR1", 
 	 "Basic system restart test. Focus on testing restart from REDO log.\n"