bzr commit into mysql-5.1-telco-6.3 branch (jonas:3056)

[Jonas Oreland]

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

 3056 Jonas Oreland	2009-09-21
      ndb - adjust #loops run in testNodeRestart, so that >=2-node doesnt take forever

    modified:
      storage/ndb/test/ndbapi/testNodeRestart.cpp
=== modified file 'storage/ndb/test/ndbapi/testNodeRestart.cpp'
--- a/storage/ndb/test/ndbapi/testNodeRestart.cpp	2009-09-14 12:51:36 +0000
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp	2009-09-21 09:12:10 +0000
@@ -312,7 +312,10 @@ int runRestarter(NDBT_Context* ctx, NDBT
     return NDBT_FAILED;
   }
   
-  loops *= (restarter.getNumDbNodes() > 4 ? 4 : restarter.getNumDbNodes());
+  loops *= (restarter.getNumDbNodes() > 2 ? 2 : restarter.getNumDbNodes());
+  if (loops < restarter.getNumDbNodes())
+    loops = restarter.getNumDbNodes();
+
   while(i<loops && result != NDBT_FAILED && !ctx->isTestStopped()){
 
     int id = lastId % restarter.getNumDbNodes();


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