bzr push into mysql-5.1-innodb branch (marko.makela:3712 to 3713) Bug#60049

[marko.makela]

 3713 Marko Mäkelä	2011-02-17
      Allow 30 seconds for slow shutdown in the Bug #60049 test.

    modified:
      mysql-test/suite/innodb/t/innodb_bug60049.test
      mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
 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
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:[e-mail]-20110217170953-952xbu45ww1rpl46
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:marko.makela@stripped
@@ -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)

=== modified file 'mysql-test/suite/innodb_plugin/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test	revid:vasil.dimov@strippedu45ww1rpl46
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test	revid:marko.makela@stripped33-g20ifwgdpc64cdkx
@@ -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/[e-mail]