Merge mysql-5.1-innodb -> mysql-5.1

mysql-test/suite/innodb/t/innodb_bug60049.test

@@ -13,7 +13,7 @@ let $MYSQLD_DATADIR=`select @@datadir`;
 
 # Shut down the server
 -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--- shutdown_server 10
+-- shutdown_server 30
 -- source include/wait_until_disconnected.inc
 
 # Check the tail of ID_IND (SYS_TABLES.ID)

mysql-test/suite/innodb_plugin/t/innodb_bug60049.test

@@ -13,7 +13,7 @@ let $MYSQLD_DATADIR=`select @@datadir`;
 
 # Shut down the server
 -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--- shutdown_server 10
+-- shutdown_server 30
 -- source include/wait_until_disconnected.inc
 
 # Check the tail of ID_IND (SYS_TABLES.ID)

mysql-test/suite/innodb_plugin/t/innodb_information_schema.test

@@ -116,11 +116,29 @@ SELECT * FROM ```t'\"_str` WHERE c1 = '4' FOR UPDATE;
 # 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;
+# Notice that if we query INNODB_LOCKS more often than once per 0.1 sec
-let $table = INFORMATION_SCHEMA.INNODB_LOCKS;
+# then its contents will never change because the cache from which it is
--- source include/wait_until_rows_count.inc
+# filled is updated only if it has not been read for 0.1 seconds. See
-# the above enables the query log, re-disable it
+# CACHE_MIN_IDLE_TIME_US in trx/trx0i_s.c.
--- disable_query_log
+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;