From 2070da70924400b1a4b40c1baeb073978c13a2f3 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Thu, 25 Dec 2008 17:53:24 +0800 Subject: BUG#40704 main.events_restart fails sporadically in pushbuild: "server has gone away" mysqltest command 'shutdown_server' is supposed to shutdown the server and wait for it to be gone, and kill it when timeout. But because the arguments passed to my_kill were in the wrong order, 'shutdown_server' does not wait nor kill the server at all. So after 'shutdown_server', the server is still running, and the server may still accepting connections. mysql-test/include/mtr_warnings.sql: Suppress forcing close thread messages when server shuts down mysql-test/include/restart_mysqld.inc: wait_until_disconnected.inc is not required after fix shutdown_server command --- mysql-test/include/restart_mysqld.inc | 3 --- 1 file changed, 3 deletions(-) (limited to 'mysql-test/include/restart_mysqld.inc') diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc index 30b6c7ce70f..0f363ff1ee3 100644 --- a/mysql-test/include/restart_mysqld.inc +++ b/mysql-test/include/restart_mysqld.inc @@ -9,9 +9,6 @@ EOF # it 10 seconds to die before zapping it shutdown_server 10; -# Check server is gone ---source include/wait_until_disconnected.inc - # Write file to make mysql-test-run.pl start up the server again --append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect restart -- cgit v1.2.1