bzr push into mysql-5.1-telco-7.0 branch (jan.wedvik:4949 to 4950)

[Jan Wedvik]

 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).