From db68eb69f9e0e30dd1b2ce0cf875ea826419bab8 Mon Sep 17 00:00:00 2001 From: Julius Goryavsky Date: Wed, 6 Nov 2024 01:39:31 +0100 Subject: [PATCH] MDEV-35344: post-fix correction for other galera tests --- mysql-test/suite/galera/r/MDEV-10715.result | 2 +- mysql-test/suite/galera/r/MDEV-27806.result | 2 +- mysql-test/suite/galera/r/galera_gtid_server_id.result | 2 +- mysql-test/suite/galera/r/galera_gtid_slave.result | 2 +- .../suite/galera/r/galera_gtid_slave_sst_rsync.result | 2 +- mysql-test/suite/galera/r/galera_gtid_trx_conflict.result | 2 +- mysql-test/suite/galera/r/galera_last_committed_id.result | 2 +- .../suite/galera/r/galera_query_cache_invalidate.result | 4 ++-- mysql-test/suite/galera/r/galera_sync_wait_upto.result | 2 +- .../suite/galera/r/galera_var_gtid_domain_id.result | 2 +- mysql-test/suite/galera/r/mdev_10518.result | 2 +- mysql-test/suite/galera/t/MDEV-10715.test | 2 +- mysql-test/suite/galera/t/MDEV-27806.test | 2 +- mysql-test/suite/galera/t/galera_gtid_server_id.test | 2 +- mysql-test/suite/galera/t/galera_gtid_slave.test | 2 +- .../suite/galera/t/galera_gtid_slave_sst_rsync.test | 2 +- mysql-test/suite/galera/t/galera_gtid_trx_conflict.test | 2 +- mysql-test/suite/galera/t/galera_last_committed_id.test | 2 +- .../suite/galera/t/galera_query_cache_invalidate.test | 4 ++-- mysql-test/suite/galera/t/galera_sync_wait_upto.test | 2 +- mysql-test/suite/galera/t/galera_var_gtid_domain_id.test | 2 +- mysql-test/suite/galera/t/mdev_10518.test | 2 +- mysql-test/suite/galera_3nodes/r/MDEV-29171.result | 4 ++-- mysql-test/suite/galera_3nodes/r/galera_2_cluster.result | 8 ++++---- .../suite/galera_3nodes/r/galera_gtid_consistency.result | 4 ++-- mysql-test/suite/galera_3nodes/t/MDEV-29171.test | 4 ++-- mysql-test/suite/galera_3nodes/t/galera_2_cluster.test | 8 ++++---- .../suite/galera_3nodes/t/galera_gtid_consistency.test | 4 ++-- mysql-test/suite/galera_sr/r/mdev_18631.result | 2 +- mysql-test/suite/galera_sr/t/mdev_18631.test | 2 +- 30 files changed, 42 insertions(+), 42 deletions(-) diff --git a/mysql-test/suite/galera/r/MDEV-10715.result b/mysql-test/suite/galera/r/MDEV-10715.result index 12b9c2367c4..471c8b34c4d 100644 --- a/mysql-test/suite/galera/r/MDEV-10715.result +++ b/mysql-test/suite/galera/r/MDEV-10715.result @@ -27,4 +27,4 @@ wsrep_last_written_gtid() connection node_1; drop table t1; connection node_2; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/r/MDEV-27806.result b/mysql-test/suite/galera/r/MDEV-27806.result index 6fe288f4e8e..5b30d05fdf9 100644 --- a/mysql-test/suite/galera/r/MDEV-27806.result +++ b/mysql-test/suite/galera/r/MDEV-27806.result @@ -49,4 +49,4 @@ mysqld-bin.000003 # Query # # COMMIT BINLOG_POSITIONS_MATCH 1 DROP TABLE t1,ts1; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/r/galera_gtid_server_id.result b/mysql-test/suite/galera/r/galera_gtid_server_id.result index 5acf4519d0c..2b9eaffeded 100644 --- a/mysql-test/suite/galera/r/galera_gtid_server_id.result +++ b/mysql-test/suite/galera/r/galera_gtid_server_id.result @@ -5,7 +5,7 @@ select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode; @@gtid_domain_id @@server_id @@wsrep_gtid_domain_id @@wsrep_gtid_mode 0 11 1 1 connection node_2; -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode; @@gtid_domain_id @@server_id @@wsrep_gtid_domain_id @@wsrep_gtid_mode 0 12 1 1 diff --git a/mysql-test/suite/galera/r/galera_gtid_slave.result b/mysql-test/suite/galera/r/galera_gtid_slave.result index d460d169811..180be320102 100644 --- a/mysql-test/suite/galera/r/galera_gtid_slave.result +++ b/mysql-test/suite/galera/r/galera_gtid_slave.result @@ -42,4 +42,4 @@ SET GLOBAL wsrep_on=ON; connection node_3; reset master; connection node_2; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result index f41e3abc497..e9f11d6f44b 100644 --- a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result +++ b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result @@ -167,4 +167,4 @@ set global wsrep_on=ON; connection node_3; reset master; connection node_2; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result b/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result index 602816f18a9..a30351b2c39 100644 --- a/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result +++ b/mysql-test/suite/galera/r/galera_gtid_trx_conflict.result @@ -42,4 +42,4 @@ SELECT @@gtid_binlog_state; @@gtid_binlog_state 1-1-101 DROP TABLE t1; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/r/galera_last_committed_id.result b/mysql-test/suite/galera/r/galera_last_committed_id.result index 1a1339ede32..58206baf7fe 100644 --- a/mysql-test/suite/galera/r/galera_last_committed_id.result +++ b/mysql-test/suite/galera/r/galera_last_committed_id.result @@ -34,4 +34,4 @@ wsrep_last_written_id_advanced SET AUTOCOMMIT=ON; DROP TABLE t1; connection node_2; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/r/galera_query_cache_invalidate.result b/mysql-test/suite/galera/r/galera_query_cache_invalidate.result index 425b512bc03..078920da3f2 100644 --- a/mysql-test/suite/galera/r/galera_query_cache_invalidate.result +++ b/mysql-test/suite/galera/r/galera_query_cache_invalidate.result @@ -3,9 +3,9 @@ connection node_1; connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4; connection node_2; -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); connection node_4; -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); connection node_3; CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos;; START SLAVE; diff --git a/mysql-test/suite/galera/r/galera_sync_wait_upto.result b/mysql-test/suite/galera/r/galera_sync_wait_upto.result index c9f468774fb..c6e5be5c232 100644 --- a/mysql-test/suite/galera/r/galera_sync_wait_upto.result +++ b/mysql-test/suite/galera/r/galera_sync_wait_upto.result @@ -24,4 +24,4 @@ WSREP_SYNC_WAIT_UPTO connection node_1; DROP TABLE t1; connection node_2; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result index 0edfdf47d34..7de74462ebc 100644 --- a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result +++ b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result @@ -90,7 +90,7 @@ set global wsrep_on=OFF; reset master; set global wsrep_on=ON; connection node_2; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); disconnect node_2; disconnect node_1; # End of test diff --git a/mysql-test/suite/galera/r/mdev_10518.result b/mysql-test/suite/galera/r/mdev_10518.result index 8426cd31349..09d4a6cb729 100644 --- a/mysql-test/suite/galera/r/mdev_10518.result +++ b/mysql-test/suite/galera/r/mdev_10518.result @@ -90,7 +90,7 @@ set global wsrep_on=OFF; reset master; set global wsrep_on=ON; connection node_2; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); disconnect node_2; disconnect node_1; # End of test diff --git a/mysql-test/suite/galera/t/MDEV-10715.test b/mysql-test/suite/galera/t/MDEV-10715.test index 20c5293f01b..29831994fdd 100644 --- a/mysql-test/suite/galera/t/MDEV-10715.test +++ b/mysql-test/suite/galera/t/MDEV-10715.test @@ -19,4 +19,4 @@ select wsrep_last_written_gtid(); drop table t1; --connection node_2 -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); \ No newline at end of file +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/t/MDEV-27806.test b/mysql-test/suite/galera/t/MDEV-27806.test index 62a0ca483e0..f8d896adb2d 100644 --- a/mysql-test/suite/galera/t/MDEV-27806.test +++ b/mysql-test/suite/galera/t/MDEV-27806.test @@ -48,4 +48,4 @@ CREATE TABLE ts1 AS SELECT * FROM t1; DROP TABLE t1,ts1; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/t/galera_gtid_server_id.test b/mysql-test/suite/galera/t/galera_gtid_server_id.test index f61bef4909b..df72e9a0c6e 100644 --- a/mysql-test/suite/galera/t/galera_gtid_server_id.test +++ b/mysql-test/suite/galera/t/galera_gtid_server_id.test @@ -3,7 +3,7 @@ --connection node_1 select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode; --connection node_2 -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode; --connection node_1 diff --git a/mysql-test/suite/galera/t/galera_gtid_slave.test b/mysql-test/suite/galera/t/galera_gtid_slave.test index b3fbbb02d5f..e798cc7fdb5 100644 --- a/mysql-test/suite/galera/t/galera_gtid_slave.test +++ b/mysql-test/suite/galera/t/galera_gtid_slave.test @@ -92,4 +92,4 @@ SET GLOBAL wsrep_on=ON; reset master; --connection node_2 -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test index b2ddc7e153d..148bbc2b460 100644 --- a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test +++ b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test @@ -199,4 +199,4 @@ set global wsrep_on=ON; reset master; --connection node_2 -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test b/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test index 6f05196b8da..940b66e54ab 100644 --- a/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test +++ b/mysql-test/suite/galera/t/galera_gtid_trx_conflict.test @@ -53,4 +53,4 @@ SELECT @@gtid_binlog_state; SELECT @@gtid_binlog_state; DROP TABLE t1; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/t/galera_last_committed_id.test b/mysql-test/suite/galera/t/galera_last_committed_id.test index 6e1f0de7d0b..e3746b5a96d 100644 --- a/mysql-test/suite/galera/t/galera_last_committed_id.test +++ b/mysql-test/suite/galera/t/galera_last_committed_id.test @@ -66,4 +66,4 @@ SET AUTOCOMMIT=ON; DROP TABLE t1; --connection node_2 -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/t/galera_query_cache_invalidate.test b/mysql-test/suite/galera/t/galera_query_cache_invalidate.test index fde02d6b9a8..c5c5f69dc27 100644 --- a/mysql-test/suite/galera/t/galera_query_cache_invalidate.test +++ b/mysql-test/suite/galera/t/galera_query_cache_invalidate.test @@ -22,9 +22,9 @@ --connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4 --connection node_2 -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); --connection node_4 -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); --connection node_3 diff --git a/mysql-test/suite/galera/t/galera_sync_wait_upto.test b/mysql-test/suite/galera/t/galera_sync_wait_upto.test index dce856c10f2..aaecd8760f5 100644 --- a/mysql-test/suite/galera/t/galera_sync_wait_upto.test +++ b/mysql-test/suite/galera/t/galera_sync_wait_upto.test @@ -73,4 +73,4 @@ INSERT INTO t1 VALUES (2); DROP TABLE t1; --connection node_2 -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test index 4de1121ae77..c9b8a890209 100644 --- a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test +++ b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test @@ -60,7 +60,7 @@ reset master; set global wsrep_on=ON; --connection node_2 -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); --source include/galera_end.inc --echo # End of test diff --git a/mysql-test/suite/galera/t/mdev_10518.test b/mysql-test/suite/galera/t/mdev_10518.test index 4de1121ae77..c9b8a890209 100644 --- a/mysql-test/suite/galera/t/mdev_10518.test +++ b/mysql-test/suite/galera/t/mdev_10518.test @@ -60,7 +60,7 @@ reset master; set global wsrep_on=ON; --connection node_2 -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); --source include/galera_end.inc --echo # End of test diff --git a/mysql-test/suite/galera_3nodes/r/MDEV-29171.result b/mysql-test/suite/galera_3nodes/r/MDEV-29171.result index 3a91bfea211..88883eb17a0 100644 --- a/mysql-test/suite/galera_3nodes/r/MDEV-29171.result +++ b/mysql-test/suite/galera_3nodes/r/MDEV-29171.result @@ -56,7 +56,7 @@ connection node_1; set global wsrep_gtid_domain_id=100; connection node_2; set global wsrep_gtid_domain_id=100; -CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); connection node_3; set global wsrep_gtid_domain_id=100; -CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result index 5214eafa1c8..bdd18ee2534 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result +++ b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result @@ -75,19 +75,19 @@ connection node_2; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); connection node_3; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); connection node_5; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); connection node_6; SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.result b/mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.result index 91ff0342b8d..22eef0eec80 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.result +++ b/mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.result @@ -199,12 +199,12 @@ SELECT COUNT(*) FROM t1; COUNT(*) 1950 connection node_2; -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); connection node_3; -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); diff --git a/mysql-test/suite/galera_3nodes/t/MDEV-29171.test b/mysql-test/suite/galera_3nodes/t/MDEV-29171.test index df1282609f0..4d67bf6ad0b 100644 --- a/mysql-test/suite/galera_3nodes/t/MDEV-29171.test +++ b/mysql-test/suite/galera_3nodes/t/MDEV-29171.test @@ -119,8 +119,8 @@ set global wsrep_gtid_domain_id=100; --connection node_2 set global wsrep_gtid_domain_id=100; -CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); --connection node_3 set global wsrep_gtid_domain_id=100; -CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test b/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test index d7b0f36551f..8fc9e492342 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test +++ b/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test @@ -129,7 +129,7 @@ SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); --connection node_3 @@ -137,7 +137,7 @@ SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); --connection node_5 @@ -145,7 +145,7 @@ SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); --connection node_6 @@ -153,4 +153,4 @@ SET GLOBAL wsrep_on = OFF; RESET MASTER; SET GLOBAL wsrep_on = ON; -CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); +CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node"); diff --git a/mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test b/mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test index 871014b39d0..4d99f865cb2 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test +++ b/mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test @@ -343,12 +343,12 @@ SELECT COUNT(*) FROM t1; # cleanups # --connection node_2 -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); --connection node_3 -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); diff --git a/mysql-test/suite/galera_sr/r/mdev_18631.result b/mysql-test/suite/galera_sr/r/mdev_18631.result index aa3b2c252e8..8e02d09ffd8 100644 --- a/mysql-test/suite/galera_sr/r/mdev_18631.result +++ b/mysql-test/suite/galera_sr/r/mdev_18631.result @@ -5,7 +5,7 @@ connection node_1; CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB; INSERT INTO t1 VALUES (1), (2), (3); connection node_2; -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); SELECT * FROM t1; f1 1 diff --git a/mysql-test/suite/galera_sr/t/mdev_18631.test b/mysql-test/suite/galera_sr/t/mdev_18631.test index 3e99e9fa9dc..2721e5028eb 100644 --- a/mysql-test/suite/galera_sr/t/mdev_18631.test +++ b/mysql-test/suite/galera_sr/t/mdev_18631.test @@ -13,7 +13,7 @@ CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB; INSERT INTO t1 VALUES (1), (2), (3); --connection node_2 -call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); +call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); SELECT * FROM t1; --connection node_1