From: Jan Wedvik
Date: June 26 2012 12:29pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (jan.wedvik:4949 to 4950)
List-Archive: http://lists.mysql.com/commits/144314
Message-Id: <20120626122928.31773.47049.4950@atum17.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4950 Jan Wedvik	2012-06-26 [merge]
      Merge 6.3->7.0

    modified:
      storage/ndb/test/ndbapi/testScan.cpp
 4949 Jan Wedvik	2012-06-26 [merge]
      Merge 6.3->7.0

    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 09:18:05 +0000
+++ b/storage/ndb/test/ndbapi/testScan.cpp	2012-06-26 12:28:59 +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).