bzr push into mysql-5.1-telco-7.0 branch (jonas:3011 to 3013)

[Jonas Oreland]

 3013 Jonas Oreland	2009-03-31
      temporary disable events_restart
modified:
  mysql-test/t/disabled.def

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

 3011 Jonas Oreland	2009-03-30 [merge]
      merge 63 to 64
modified:
  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
  storage/ndb/test/ndbapi/testNdbApi.cpp
  storage/ndb/test/run-test/daily-basic-tests.txt

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-02-18 08:46:29 +0000
+++ b/mysql-test/t/disabled.def	2009-03-31 10:45:07 +0000
@@ -15,3 +15,5 @@ innodb_bug39438          : BUG#42383 200
 innodb			 : Bug #37995  	Error message truncation in test "innodb" in embedded mode
 concurrent_innodb_unsafelog: Bug #41498 concurrent_innodb_unsafelog fails sporadically
 concurrent_innodb_safelog: Bug #39484  	main.concurrent_innodb_safelog fails sporadically
+events_restart           : Disable until Wen fixes add_node*.test related problems
+

=== modified file 'storage/ndb/test/ndbapi/testTimeout.cpp'
--- a/storage/ndb/test/ndbapi/testTimeout.cpp	2008-10-07 06:09:35 +0000
+++ b/storage/ndb/test/ndbapi/testTimeout.cpp	2009-03-31 10:41:52 +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