diff options
author | unknown <knielsen@knielsen-hq.org> | 2013-04-25 13:25:14 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2013-04-25 13:25:14 +0200 |
commit | ced65e21c60ca7342e8b11b888360b86bf83952d (patch) | |
tree | 46a78f3a634b3ddfc2ac30ff08d830b28114e622 /mysql-test/include/restart_mysqld.inc | |
parent | 6b97512b2170fc6a77288cef6e5a85cad773ae4e (diff) | |
download | mariadb-git-ced65e21c60ca7342e8b11b888360b86bf83952d.tar.gz |
Fix more failures in buildbot.
Server shutdown timeout of 10 seconds in test cases is too little for heavily
loaded test servers.
Fix innodb_bug12902967 to not fail with wrong error log output if we have
warnings about too few AIO handles for InnoDB.
Fix typo which could lead to unnecessarily replacing GTID event with dummy
event.
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
-rw-r--r-- | mysql-test/include/restart_mysqld.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 7cb9c7994d8..49f6dfd5364 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -14,8 +14,8 @@ if ($rpl_inited) --exec echo "wait" > $_expect_file_name # Send shutdown to the connected server and give -# it 10 seconds to die before zapping it -shutdown_server 10; +# it 60 seconds to die before zapping it +shutdown_server 60; # Write file to make mysql-test-run.pl start up the server again --exec echo "restart" > $_expect_file_name |