bzr push into mysql-5.1-telco-6.3 branch (jonas:2918 to 2919)

[Jonas Oreland]

 2919 Jonas Oreland	2009-03-31 [merge]
      merge 62 to 63
modified:
  storage/ndb/test/ndbapi/testTimeout.cpp

 2918 Frazer Clement	2009-03-30 [merge]
      Merge 6.2->6.3
modified:
  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
  storage/ndb/test/ndbapi/testNdbApi.cpp
  storage/ndb/test/run-test/daily-basic-tests.txt

=== modified file 'storage/ndb/test/ndbapi/testTimeout.cpp'
--- a/storage/ndb/test/ndbapi/testTimeout.cpp	2006-12-23 19:20:40 +0000
+++ b/storage/ndb/test/ndbapi/testTimeout.cpp	2009-03-31 10:31:01 +0000
@@ -366,14 +366,16 @@ int runBuddyTransNoTimeout(NDBT_Context*
       CHECK(hugoOps.pkInsertRecord(pNdb, recordNo) == 0);
       CHECK(hugoOps.execute_NoCommit(pNdb) == 0);
       
+      int remain = maxSleep;
       for (int i = 0; i < 3; i++){
 	// Perform buddy scan reads
 	CHECK((hugoOps.scanReadRecords(pNdb)) == 0);
 	CHECK(hugoOps.execute_NoCommit(pNdb) == 0); 
 	
-	int sleep = myRandom48(maxSleep);   	
-	ndbout << "Sleeping for " << sleep << " milliseconds" << endl;
-	NdbSleep_MilliSleep(sleep);
+        int sleep = myRandom48(remain);
+        remain = remain - sleep + 1;
+        ndbout << "Sleeping for " << sleep << " milliseconds" << endl;
+        NdbSleep_MilliSleep(sleep);
       }
 
       // Expect that transaction has NOT timed-out