summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2018-04-23 07:46:45 +0300
committerGitHub <noreply@github.com>2018-04-23 07:46:45 +0300
commit31a19683f5289f08439b848da23a28f49ff0accc (patch)
treeaca964fac8af269c785f7b7d7af70e41a1ec3983
parent3d1ad2a5e85284b5ec4bb28f744b93b0b73e3934 (diff)
parent3aa5f00e69343a44aa1eac599aed0117a5fa264c (diff)
downloadmariadb-git-31a19683f5289f08439b848da23a28f49ff0accc.tar.gz
Merge pull request #711 from codership/MDEV-15929
MDEV-15929 Fix lock wait timeout on `SELECT @@GLOBAL.WSREP_ON`
-rw-r--r--mysql-test/suite/galera/include/galera_st_kill_slave.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/include/galera_st_kill_slave.inc b/mysql-test/suite/galera/include/galera_st_kill_slave.inc
index bae37755c65..ecdf08726a0 100644
--- a/mysql-test/suite/galera/include/galera_st_kill_slave.inc
+++ b/mysql-test/suite/galera/include/galera_st_kill_slave.inc
@@ -24,7 +24,6 @@ COMMIT;
--source include/kill_galera.inc
--connection node_1
---source include/wait_until_connected_again.inc
--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
--source include/wait_condition.inc