diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-04-25 08:47:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 08:47:54 +0300 |
| commit | 2cdaa5696c00d0d0f179f9c30baa083af9edc0d0 (patch) | |
| tree | 083bd49404810db5cc633f47d0e080941ff6d776 | |
| parent | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (diff) | |
| parent | 92cd6bb5109934c6ef38921c1c130c9fcb19e80a (diff) | |
| download | mariadb-git-2cdaa5696c00d0d0f179f9c30baa083af9edc0d0.tar.gz | |
Merge pull request #719 from codership/MDEV-15811
MDEV-15811 Fix and re-enable test galera.galera_pc_ignore_sb
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 6ac85a8bb47..4d83e2ba2ce 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -31,4 +31,3 @@ galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on query_cache : MDEV-15805 Test failure on galera.query_cache galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 -galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index 84fd3a91857..f24ca5cd25b 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -20,6 +20,9 @@ SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; --source include/kill_galera.inc --connection node_1 +--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); DROP TABLE t1; @@ -37,10 +40,8 @@ SET GLOBAL wsrep_cluster_address = ''; --connection node_2 --source include/start_mysqld.inc ---source include/wait_until_connected_again.inc # Restore original auto_increment_offset values. --source include/auto_increment_offset_restore.inc --source include/galera_end.inc - |