List:Commits« Previous MessageNext Message »
From:Jan Wedvik Date:June 26 2012 12:33pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (jan.wedvik:3951 to 3952)
View as plain text  
 3952 Jan Wedvik	2012-06-26 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/test/ndbapi/testScan.cpp
 3951 Jan Wedvik	2012-06-26 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/test/ndbapi/testScan.cpp'
--- a/storage/ndb/test/ndbapi/testScan.cpp	2012-06-26 11:05:35 +0000
+++ b/storage/ndb/test/ndbapi/testScan.cpp	2012-06-26 12:33:15 +0000
@@ -1721,7 +1721,8 @@ runExtraNextResult(NDBT_Context* ctx, ND
     }
     
     // Do a random numer of scans in this transaction.
-    for (Uint32 j=0; j < random()%4; j++)
+    const int scanCount = rand()%4;
+    for (int j=0; j < scanCount; j++)
     {
       NdbScanOperation* const scan = trans->getNdbScanOperation(pTab);
       if (scan == NULL)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (jan.wedvik:3951 to 3952) Jan Wedvik26 Jun