bzr push into mysql-5.1-innodb branch (vasil.dimov:3711 to 3712)

[vasil.dimov]

 3712 Vasil Dimov	2011-02-17
      Fix the non-determinism in innodb_information_schema.test
      
      Thanks to Kristian Nielsen for finding out the root cause for the
      failure, see: https://bugs.launchpad.net/maria/+bug/677407

    modified:
      mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
 3711 Marko Mäkelä	2011-02-17
      Disable the Bug #60049 test on embedded, as it requires server restart.

    modified:
      mysql-test/suite/innodb/t/innodb_bug60049.test
      mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
=== modified file 'mysql-test/suite/innodb_plugin/t/innodb_information_schema.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test	revid:marko.makela@strippedom-20110217074507-ho9m1ejjl4s7uxzd
+++ b/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test	revid:vasil.dimov@stripped
@@ -116,11 +116,29 @@ SELECT * FROM ```t'\"_str` WHERE c1 = '4
 # executes before some of them, resulting in less than expected number
 # of rows being selected from innodb_locks. If there is a bug and there
 # are no 14 rows in innodb_locks then this test will fail with timeout.
-let $count = 14;
-let $table = INFORMATION_SCHEMA.INNODB_LOCKS;
--- source include/wait_until_rows_count.inc
-# the above enables the query log, re-disable it
--- disable_query_log
+# Notice that if we query INNODB_LOCKS more often than once per 0.1 sec
+# then its contents will never change because the cache from which it is
+# filled is updated only if it has not been read for 0.1 seconds. See
+# CACHE_MIN_IDLE_TIME_US in trx/trx0i_s.c.
+let $cnt=10;
+while ($cnt)
+{
+    let $success=`SELECT COUNT(*) = 14 FROM INFORMATION_SCHEMA.INNODB_LOCKS`;
+    if ($success)
+    {
+        let $cnt=0;
+    }
+    if (!$success)
+    {
+        real_sleep 0.2;
+        dec $cnt;
+    }
+}
+if (!$success)
+{
+    -- echo Timeout waiting for rows in INNODB_LOCKS to appear
+}
+
 SELECT lock_mode, lock_type, lock_table, lock_index, lock_rec, lock_data
 FROM INFORMATION_SCHEMA.INNODB_LOCKS ORDER BY lock_data;
 

No bundle (reason: useless for push emails).