bk commit into 5.1 tree (jonas:1.2586)

[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-09-29 12:32:20+02:00, jonas@stripped +1 -0
  fix weird merge error

  storage/ndb/test/ndbapi/testSystemRestart.cpp@stripped, 2007-09-29 12:32:18+02:00, jonas@stripped +0 -153
    fix weird merge error

# 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/telco-6.1

--- 1.18/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-09-29 12:32:24 +02:00
+++ 1.19/storage/ndb/test/ndbapi/testSystemRestart.cpp	2007-09-29 12:32:24 +02:00
@@ -1469,159 +1469,6 @@
   return result;
 }
 
-int runSR_DD_1(NDBT_Context* ctx, NDBT_Step* step)
-{
-  Ndb* pNdb = GETNDB(step);
-  int result = NDBT_OK;
-  Uint32 loops = ctx->getNumLoops();
-  int count;
-  NdbRestarter restarter;
-  NdbBackup backup(GETNDB(step)->getNodeId()+1);
-  bool lcploop = ctx->getProperty("LCP", (unsigned)0);
-
-  Uint32 i = 1;
-  Uint32 backupId;
-
-  int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
-  int lcp = DumpStateOrd::DihMinTimeBetweenLCP;
-
-  int startFrom = 0;
-
-  HugoTransactions hugoTrans(*ctx->getTab());
-  while(i<=loops && result != NDBT_FAILED)
-  {
-
-    if (lcploop)
-    {
-      CHECK(restarter.dumpStateAllNodes(&lcp, 1) == 0);
-    }
-
-    int nodeId = restarter.getDbNodeId(rand() % restarter.getNumDbNodes());
-    //CHECK(restarter.dumpStateAllNodes(&val, 1) == 0);
-    
-    ndbout << "Loop " << i << "/"<< loops <<" started" << endl;
-    ndbout << "Loading records..." << startFrom << endl;
-    CHECK(hugoTrans.loadTable(pNdb, startFrom) == 0);
-
-    ndbout << "Making " << nodeId << " crash" << endl;
-    int kill[] = { 9999, 1000, 3000 };
-    CHECK(restarter.dumpStateOneNode(nodeId, val, 2) == 0);
-    CHECK(restarter.dumpStateOneNode(nodeId, kill, 3) == 0);
-
-    Uint64 end = NdbTick_CurrentMillisecond() + 4000;
-    Uint32 row = startFrom;
-    do {
-      ndbout << "Loading from " << row << " to " << row + 1000 << endl;
-      if (hugoTrans.loadTableStartFrom(pNdb, row, 1000) != 0)
-	break;
-      row += 1000;
-    } while (NdbTick_CurrentMillisecond() < end);
-
-    ndbout << "Waiting for " << nodeId << " to restart" << endl;
-    CHECK(restarter.waitNodesNoStart(&nodeId, 1) == 0);
-    
-    ndbout << "Restarting cluster" << endl;
-    CHECK(restarter.restartAll(false, true, true) == 0);
-    CHECK(restarter.waitClusterNoStart() == 0);
-    CHECK(restarter.startAll() == 0);
-    CHECK(restarter.waitClusterStarted() == 0);
-    
-    ndbout << "Starting backup..." << flush;
-    CHECK(backup.start(backupId) == 0);
-    ndbout << "done" << endl;
-
-    int cnt = 0;
-    CHECK(hugoTrans.selectCount(pNdb, 0, &cnt) == 0);
-    ndbout << "Found " << cnt << " records..." << endl;
-    ndbout << "Clearing..." << endl;    
-    CHECK(hugoTrans.clearTable(pNdb,
-                               NdbScanOperation::SF_TupScan, cnt) == 0);
-    
-    if (cnt > startFrom)
-    {
-      startFrom = cnt;
-    }
-    startFrom += 1000;
-    i++;
-  }
-  
-  ndbout << "runSR_DD_1 finished" << endl;  
-  
-  return result;
-}
-
-int runSR_DD_2(NDBT_Context* ctx, NDBT_Step* step)
-{
-  Ndb* pNdb = GETNDB(step);
-  int result = NDBT_OK;
-  Uint32 loops = ctx->getNumLoops();
-  Uint32 rows = ctx->getNumRecords();
-  int count;
-  NdbRestarter restarter;
-  NdbBackup backup(GETNDB(step)->getNodeId()+1);
-  bool lcploop = ctx->getProperty("LCP", (unsigned)0);
-
-  Uint32 i = 1;
-  Uint32 backupId;
-
-  int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
-  int lcp = DumpStateOrd::DihMinTimeBetweenLCP;
-
-  int startFrom = 0;
-
-  HugoTransactions hugoTrans(*ctx->getTab());
-  while(i<=loops && result != NDBT_FAILED)
-  {
-
-    if (lcploop)
-    {
-      CHECK(restarter.dumpStateAllNodes(&lcp, 1) == 0);
-    }
-
-    int nodeId = restarter.getDbNodeId(rand() % restarter.getNumDbNodes());
-    
-    ndbout << "Making " << nodeId << " crash" << endl;
-    int kill[] = { 9999, 3000, 10000 };
-    CHECK(restarter.dumpStateOneNode(nodeId, val, 2) == 0);
-    CHECK(restarter.dumpStateOneNode(nodeId, kill, 3) == 0);
-
-    Uint64 end = NdbTick_CurrentMillisecond() + 11000;
-    Uint32 row = startFrom;
-    do {
-      if (hugoTrans.loadTable(pNdb, rows) != 0)
-	break;
-      
-      if (hugoTrans.clearTable(pNdb, NdbScanOperation::SF_TupScan, rows) != 0)
-	break;
-    } while (NdbTick_CurrentMillisecond() < end);
-    
-    ndbout << "Waiting for " << nodeId << " to restart" << endl;
-    CHECK(restarter.waitNodesNoStart(&nodeId, 1) == 0);
-    
-    ndbout << "Restarting cluster" << endl;
-    CHECK(restarter.restartAll(false, true, true) == 0);
-    CHECK(restarter.waitClusterNoStart() == 0);
-    CHECK(restarter.startAll() == 0);
-    CHECK(restarter.waitClusterStarted() == 0);
-    
-    ndbout << "Starting backup..." << flush;
-    CHECK(backup.start(backupId) == 0);
-    ndbout << "done" << endl;
-
-    int cnt = 0;
-    CHECK(hugoTrans.selectCount(pNdb, 0, &cnt) == 0);
-    ndbout << "Found " << cnt << " records..." << endl;
-    ndbout << "Clearing..." << endl;    
-    CHECK(hugoTrans.clearTable(pNdb,
-                               NdbScanOperation::SF_TupScan, cnt) == 0);
-    i++;
-  }
-  
-  ndbout << "runSR_DD_2 finished" << endl;  
-  
-  return result;
-}
-
 NDBT_TESTSUITE(testSystemRestart);
 TESTCASE("SR1", 
 	 "Basic system restart test. Focus on testing restart from REDO log.\n"