Merge mysql-5.1-innodb to mysql-5.5-innodb.

7e6f3517 · Marko Mäkelä · f19a4c0d · db55cf85 · 7e6f3517
Commit 7e6f3517 authored Feb 17, 2011 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test
+++ b/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)