diff options
| author | Monty <monty@mariadb.org> | 2018-02-07 17:25:46 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-02-07 17:25:46 +0200 |
| commit | 5c057b3fef3aa92cfadbd63043799b430132a494 (patch) | |
| tree | e4d04d2a80d7b8517c2f9ccfaded98df2dd80651 /mysql-test | |
| parent | 5a7b6db6711b00e000b569d6681bc2802e805a19 (diff) | |
| download | mariadb-git-5c057b3fef3aa92cfadbd63043799b430132a494.tar.gz | |
Disabled galera_ist_progress at it always fails in 10.2
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/assert_grep.inc | 5 | ||||
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/include/assert_grep.inc b/mysql-test/include/assert_grep.inc index a980a6d73b1..9f2c8505262 100644 --- a/mysql-test/include/assert_grep.inc +++ b/mysql-test/include/assert_grep.inc @@ -130,7 +130,10 @@ EOF --let $_ag_outcome= `SELECT LOAD_FILE('$_AG_OUT')` if ($_ag_outcome != 'assert_grep.inc ok') { - --source include/show_rpl_debug_info.inc + if ($rpl_server_count != '') + { + --source include/show_rpl_debug_info.inc + } --echo include/assert_grep.inc failed! --echo assert_text: '$assert_text' --echo assert_file: '$assert_file' diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index ea3176285b2..bcf4a107724 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -59,4 +59,5 @@ MW-328C: MDEV-13549 Galera test failures 10.1 MW-328A: MDEV-13549 Galera test failures 10.1 MW-328B: MDEV-13549 Galera test failures 10.1 MW-328: MDEV-13549 Galera test failures 10.1 -galera_suspend_slave: MDEV-13549 Galera test failures 10.1
\ No newline at end of file +galera_suspend_slave: MDEV-13549 Galera test failures 10.1 +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status |