summaryrefslogtreecommitdiff
path: root/mysql-test/include/restart_mysqld.inc
diff options
context:
space:
mode:
authorHe Zhenxing <zhenxing.he@sun.com>2008-12-25 17:53:24 +0800
committerHe Zhenxing <zhenxing.he@sun.com>2008-12-25 17:53:24 +0800
commit2070da70924400b1a4b40c1baeb073978c13a2f3 (patch)
tree0c37201b5d23c3a2227a91816b347889847e9cec /mysql-test/include/restart_mysqld.inc
parent2349c56f1cec668bb5f8bacd620ee5ca00acdbd5 (diff)
downloadmariadb-git-2070da70924400b1a4b40c1baeb073978c13a2f3.tar.gz
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
Diffstat (limited to 'mysql-test/include/restart_mysqld.inc')
-rw-r--r--mysql-test/include/restart_mysqld.inc3
1 files changed, 0 insertions, 3 deletions
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