#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:vasil.dimov@stripped8dwol2qozv7
3325 Marko Mäkelä 2011-02-17 [merge]
Merge mysql-5.1-innodb to mysql-5.5-innodb.
modified:
mysql-test/suite/innodb/t/innodb_bug60049.test
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test revid:vasil.dimov@strippedwol2qozv7
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test revid:marko.makela@strippedqmt152tfn0
@@ -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)
Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20110217202756-hr889aqmt152tfn0.bundle
| Thread |
|---|
| • bzr commit into mysql-5.5-innodb branch (marko.makela:3325) | marko.makela | 17 Feb |