From 992370693fef97023dde874a569d9c4e089fbeca Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Fri, 15 Sep 2017 16:56:36 +0200 Subject: [PATCH] MW-405 Remove wait_until_connected_again.inc from kill_galera.inc kill_galera.inc can no longer rely on wait_until_connected_again.inc. This is because wait_until_connected_again now tries to make sure that the server it is connected eventually transition to ready state. Whereas some tests may need to kill galera while the server is in a non-primary view. --- mysql-test/suite/galera/include/kill_galera.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-test/suite/galera/include/kill_galera.inc b/mysql-test/suite/galera/include/kill_galera.inc index c61bad8e19d..d7f665df6c7 100644 --- a/mysql-test/suite/galera/include/kill_galera.inc +++ b/mysql-test/suite/galera/include/kill_galera.inc @@ -1,7 +1,6 @@ --echo Killing server ... # Write file to make mysql-test-run.pl expect the crash, but don't start it ---source include/wait_until_connected_again.inc --let $_server_id= `SELECT @@server_id` --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect --exec echo "wait" > $_expect_file_name