bzr commit into mysql-5.1-telco-7.0 branch (jonas:3194)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/ based on revid:jonas@stripped

 3194 Jonas Oreland	2009-11-05 [merge]
      merge 63 to 70

    modified:
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/ndbapi/testSystemRestart.cpp
=== modified file 'storage/ndb/test/ndbapi/testNodeRestart.cpp'
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp	2009-11-02 17:15:29 +0000
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp	2009-11-05 10:16:57 +0000
@@ -3996,7 +3996,6 @@ TESTCASE("FullDb", 
   INITIALIZER(runCheckAllNodesStarted);
   INITIALIZER(runFillTable);
   STEP(runRestarter);
-  FINALIZER(runClearTable);
 }
 TESTCASE("RestartRandomNode", 
 	 "Test that we can execute the restart RestartRandomNode loop\n"\

=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2009-10-30 14:10:30 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2009-11-05 10:16:57 +0000
@@ -1835,12 +1835,12 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
   }
 
   struct ndb_logevent event;
+  int val[] = { DumpStateOrd::DihMinTimeBetweenLCP, 0 };
 
   Uint32 i = 0;
   while(i<=loops && result != NDBT_FAILED)
   {
-    int val = DumpStateOrd::DihMinTimeBetweenLCP;
-    CHECK(res.dumpStateAllNodes(&val, 1) == 0);
+    CHECK(res.dumpStateAllNodes(val, 1) == 0);
 
     int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT, 0 };
     NdbLogEventHandle handle = 
@@ -1905,7 +1905,7 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
     hugoTrans.clearTable(pNdb);
     hugoTrans.loadTable(pNdb, rows);
     
-    CHECK(res.dumpStateAllNodes(&val, 1) == 0);
+    CHECK(res.dumpStateAllNodes(val, 1) == 0);
     
     while(ndb_logevent_get_next(handle, &event, 0) >= 0 &&
           event.type != NDB_LE_LocalCheckpointCompleted);
@@ -1914,7 +1914,9 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
     
     i++;
   }
-  
+
+  res.dumpStateAllNodes(val, 2); // Reset LCP time
+
   ctx->stopTest();  
   return result;
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]