From 826d7c68d210f5c34998108aa5e29909344e3683 Mon Sep 17 00:00:00 2001 From: Kristian Nielsen Date: Thu, 18 Dec 2014 11:59:08 +0100 Subject: [PATCH] MDEV-7342: Test failure in perfschema.setup_instruments_defaults Fix a possible race in the test case when restarting the server. Make sure we have disconnected before waiting for the reconnect that signals that the server is back up. Otherwise, we may in rare cases continue the test while the old server is shutting down, eventually leading to "connection lost" failure. --- mysql-test/suite/perfschema/t/setup_instruments_defaults.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test index 5fd5acceb34..e1f61404d12 100644 --- a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test +++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test @@ -60,6 +60,8 @@ WHERE name like "%wait/io/table/sql/handler%"; --echo # --echo # Stop server --send_shutdown +--source include/wait_until_disconnected.inc + --echo # Restart server with wait/io/table/sql/handler disabled --exec echo "restart:--loose-performance-schema-instrument=%wait/io/table/sql/%=off" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect