summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Sciascia <daniele.sciascia@galeracluster.com>2017-09-15 16:56:36 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2018-03-23 07:27:01 +0200
commitc25743c620388a466978d4cf268751a72e9bf4f1 (patch)
treef3c9f2c62c838ce2eb174041e218b3c2ba355fb6
parent86396f2336d94f20c3977427577baf8ca6a8ab1a (diff)
downloadmariadb-git-c25743c620388a466978d4cf268751a72e9bf4f1.tar.gz
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.
-rw-r--r--mysql-test/suite/galera/include/kill_galera.inc1
1 files changed, 0 insertions, 1 deletions
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