revision-id: a2417b84633326a88d3434c45b5be9e72fe17d90 (mariadb-10.3.6-322-ga2417b84633) parent(s): 5e5ab9c664e1af0f498fde43137acb627515e524 author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-17 14:34:42 +0200 message: Fix failing test case galera.galera#500 and disable galera.galera.galera_bf_abort_group_commit both run only with debug build galera library. --- mysql-test/suite/galera/disabled.def | 1 + mysql-test/suite/galera/r/galera#500.result | 2 ++ mysql-test/suite/galera/t/galera#500.test | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index cb6c1d05e36..e7b91b33050 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -61,3 +61,4 @@ galera.galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.gal galera.galera_many_tables_nopk : MDEV-18182 Galera test failure on galera.galera_many_tables_nopk galera.galera_kill_nochanges : MDEV-18280 Galera test failure on galera_split_brain and galera_kill_nochanges galera.galera_split_brain : MDEV-18280 Galera test failure on galera_split_brain and galera_kill_nochanges +galera.galera_bf_abort_group_commit : MDEV-18282 Galera test failure on galera.galera_bf_abort_group_commit diff --git a/mysql-test/suite/galera/r/galera#500.result b/mysql-test/suite/galera/r/galera#500.result index 22d38777369..a5ab0b19718 100644 --- a/mysql-test/suite/galera/r/galera#500.result +++ b/mysql-test/suite/galera/r/galera#500.result @@ -1,5 +1,7 @@ connection node_2; connection node_1; +connection node_1; +connection node_2; connection node_2; SET SESSION wsrep_sync_wait = 0; SET GLOBAL wsrep_provider_options="gmcast.isolate=2"; diff --git a/mysql-test/suite/galera/t/galera#500.test b/mysql-test/suite/galera/t/galera#500.test index 3c8490b6907..60f303b7103 100644 --- a/mysql-test/suite/galera/t/galera#500.test +++ b/mysql-test/suite/galera/t/galera#500.test @@ -8,6 +8,10 @@ --source include/galera_cluster.inc --source include/galera_have_debug_sync.inc +--let $node_1=node_1 +--let $node_2=node_2 +--source suite/galera/include/auto_increment_offset_save.inc + # Force node_2 gcomm background thread to terminate via exception. --connection node_2 --let $wsrep_cluster_address = `SELECT @@wsrep_cluster_address` @@ -36,3 +40,5 @@ SET SESSION wsrep_on=0; --connection node_2 CALL mtr.add_suppression("WSREP: exception from gcomm, backend must be restarted: Gcomm backend termination was requested by setting gmcast.isolate=2."); + +--source suite/galera/include/auto_increment_offset_restore.inc