From: Jonas Oreland
Date: September 29 2011 6:51am
Subject: bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4558 to 4559)
List-Archive: http://lists.mysql.com/commits/141194
Message-Id: <20110929065134.5FAC5918F12@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4559 Jonas Oreland	2011-09-29
      ndb - fix incorrect NdbRestarter usage

    modified:
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/testRestartGci.cpp
 4558 Jonas Oreland	2011-09-28
      ndb - fix windows compiler warnings

    modified:
      storage/ndb/src/common/portlib/NdbCondition.c
      storage/ndb/test/ndbapi/testRestartGci.cpp
      storage/ndb/test/ndbapi/test_event.cpp
=== modified file 'storage/ndb/test/ndbapi/testNdbApi.cpp'
--- a/storage/ndb/test/ndbapi/testNdbApi.cpp	2011-09-27 05:37:30 +0000
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp	2011-09-29 06:48:39 +0000
@@ -4826,8 +4826,8 @@ runRestarts(NDBT_Context* ctx, NDBT_Step
       }
 
       ndbout << "Restart cluster" << endl;
-      if (restarter.restartAll(NdbRestarter::NRRF_NOSTART |
-                               NdbRestarter::NRRF_ABORT) != 0)
+      if (restarter.restartAll2(Uint32(NdbRestarter::NRRF_NOSTART |
+                                       NdbRestarter::NRRF_ABORT)) != 0)
       {
         g_err << "Failed to restartAll" << endl;
         result = NDBT_FAILED;

=== modified file 'storage/ndb/test/ndbapi/testRestartGci.cpp'
--- a/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-09-28 10:04:03 +0000
+++ b/storage/ndb/test/ndbapi/testRestartGci.cpp	2011-09-29 06:48:39 +0000
@@ -486,7 +486,7 @@ int runNodeInitialRestarts(NDBT_Context*
     int nodeId = restarter.getNode(NdbRestarter::NS_RANDOM);
     ndbout_c("Restarting node %u", nodeId);
 
-    if (restarter.restartOneDbNode(nodeId, NdbRestarter::NRRF_INITIAL) != 0)
+    if (restarter.restartOneDbNode2(nodeId, NdbRestarter::NRRF_INITIAL) != 0)
     {
       ndbout_c("Error restarting node");
       ctx->stopTest();

No bundle (reason: useless for push emails).