bzr push into mysql-5.1-telco-7.0 branch (jonas:3044 to 3045)

[Jonas Oreland]

 3045 Jonas Oreland	2009-09-26
      ndb - 1 more windows warning

    modified:
      storage/ndb/test/ndbapi/testDict.cpp
 3044 Jonas Oreland	2009-09-25
      ndb - and windows warnings

    modified:
      storage/ndb/test/include/NDBT_Stats.hpp
      storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
      storage/ndb/test/ndbapi/bench/testData.h
      storage/ndb/test/ndbapi/testDict.cpp
      storage/ndb/test/ndbapi/test_event.cpp
=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2009-09-25 21:26:33 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2009-09-26 06:06:44 +0000
@@ -3429,10 +3429,10 @@ int
 restartClusterInitial(NDBT_Context* ctx, NDBT_Step* step)
 {
   NdbRestarter res;
-
-  res.restartAll(Uint32(NdbRestarter::NRRF_INITIAL |
-                        NdbRestarter::NRRF_NOSTART |
-                        NdbRestarter::NRRF_ABORT));
+  
+  res.restartAll2(NdbRestarter::NRRF_INITIAL |
+                  NdbRestarter::NRRF_NOSTART |
+                  NdbRestarter::NRRF_ABORT);
   if (res.waitClusterNoStart())
     return NDBT_FAILED;
 


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