Merge branch 10.5 into 10.6

mysql-test/suite/galera/disabled.def

@@ -21,4 +21,3 @@ galera_as_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsr
 galera_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback()
 galera_sst_mysqldump_with_key : MDEV-32782 galera_sst_mysqldump_with_key test failed
 galera_var_ignore_apply_errors : MENT-1997 galera_var_ignore_apply_errors test freezes
-galera_desync_overlapped : MDEV-21538 galera_desync_overlapped MTR failed: Result content mismatch

mysql-test/suite/galera/include/galera_sst_restore.inc

@@ -20,7 +20,7 @@ CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
 CALL mtr.add_suppression("Info table is not ready to be used");
 CALL mtr.add_suppression("Native table .* has the wrong structure");
-CALL mtr.add_suppression("Table \'mysql.gtid_slave_pos\' doesn\'t exist");
+CALL mtr.add_suppression("Table 'mysql\\.gtid_slave_pos' doesn't exist");
 --disable_query_log
 --eval SET GLOBAL wsrep_sst_method = '$wsrep_sst_method_orig';
 --eval SET GLOBAL wsrep_sst_receive_address = '$wsrep_sst_receive_address_orig';

mysql-test/suite/galera/include/galera_sst_set_mysqldump.inc

@@ -4,8 +4,8 @@
 
 --echo Setting SST method to mysqldump ...
 
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
-call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127\\.0\\.0\\.1'");
+call mtr.add_suppression("Failed to load slave replication state from table mysql\\.gtid_slave_pos");
 
 --connection node_1
 # We need a user with a password to perform SST, otherwise we hit LP #1378253

mysql-test/suite/galera/r/GAL-401.result

@@ -24,6 +24,6 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`f1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
-CALL mtr.add_suppression("WSREP: Protocol violation. JOIN message sender (.*) is not in state transfer \\(SYNCED\\). Message ignored.");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender (.*) is not in state transfer \\(SYNCED\\)\\. Message ignored\\.");
 connection node_1;
 SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=false';

mysql-test/suite/galera/r/GAL-419.result

 connection node_2;
 connection node_1;
-call mtr.add_suppression("WSREP: It may not be safe to bootstrap the cluster from this node.*");
+call mtr.add_suppression("WSREP: It may not be safe to bootstrap the cluster from this node");
 call mtr.add_suppression("Aborting");
-call mtr.add_suppression("Plugin \'wsrep\' init function returned error.");
-call mtr.add_suppression("Plugin \'wsrep\' registration as a STORAGE ENGINE failed.");
-call mtr.add_suppression("Failed to initialize plugins.");
+call mtr.add_suppression("Plugin 'wsrep' init function returned error");
+call mtr.add_suppression("Plugin 'wsrep' registration as a STORAGE ENGINE failed");
+call mtr.add_suppression("Plugin 'wsrep' registration as a FUNCTION failed");
+call mtr.add_suppression("Failed to initialize plugins");
 connection node_2;
 SET SESSION wsrep_sync_wait = 0;
 Killing server ...

mysql-test/suite/galera/r/GCF-939.result

@@ -8,6 +8,6 @@ INSERT INTO t1 VALUES (1);
 GRA_.log
 GRA_.log
 DROP TABLE t1;
-CALL mtr.add_suppression("Ignoring error 'Unknown table 'test.t1'' on query");
+CALL mtr.add_suppression("Ignoring error 'Unknown table 'test\\.t1'' on query");
 connection node_2;
-CALL mtr.add_suppression("Error 'Unknown table 'test.t1'' on query");
+CALL mtr.add_suppression("Error 'Unknown table 'test\\.t1'' on query");

mysql-test/suite/galera/r/MDEV-21479.result

@@ -66,7 +66,7 @@ SHOW STATUS LIKE 'wsrep_desync_count';
 Variable_name	Value
 wsrep_desync_count	0
 SET @@global.wsrep_desync = 0;
-CALL mtr.add_suppression("WSREP: Protocol violation. JOIN message sender (.*) is not in state transfer \\(SYNCED\\). Message ignored.");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender (.*) is not in state transfer \\(SYNCED\\)\\. Message ignored\\.");
 connection node_1;
 # Wait until both nodes are back to cluster
 SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=false';

mysql-test/suite/galera/r/MDEV-26575.result

 connection node_2;
 connection node_1;
 connection node_2;
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 connection node_1;
 connection node_1;
 connection node_2;

mysql-test/suite/galera/r/MDEV-29142.result

@@ -3,14 +3,14 @@ connection node_1;
 connection node_1;
 connection node_2;
 connection node_1;
-call mtr.add_suppression("WSREP: Event .* Write_rows_v1 apply failed:.*");
-call mtr.add_suppression("WSREP: Failed to apply write set:.*");
-call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on.*");
+call mtr.add_suppression("WSREP: Event .* Write_rows_v1 apply failed: ");
+call mtr.add_suppression("WSREP: Failed to apply write set: ");
+call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 connection node_2;
-call mtr.add_suppression("WSREP: Failed to open table mysql.wsrep_streaming_log for writing");
+call mtr.add_suppression("WSREP: Failed to open table mysql\\.wsrep_streaming_log for writing");
 call mtr.add_suppression("WSREP: Failed to open SR table for write");
 call mtr.add_suppression("WSREP: Failed to recover SR transactions from schema: wsrep_on : 0");
-call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on.*");
+call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 SET @@global.tx_read_only = ON;
 SET default_storage_engine = SEQUENCE;
 create table t1 (c1 int);
@@ -39,7 +39,7 @@ connection node_1;
 SET SESSION wsrep_sync_wait = 0;
 Killing server ...
 connection node_2;
-call mtr.add_suppression("WSREP: Failed to open table mysql.wsrep_streaming_log for writing");
+call mtr.add_suppression("WSREP: Failed to open table mysql\\.wsrep_streaming_log for writing");
 call mtr.add_suppression("WSREP: Failed to open SR table for write");
 call mtr.add_suppression("WSREP: Failed to recover SR transactions from schema: wsrep_on : 0");
 DROP TABLE IF EXISTS t1;

mysql-test/suite/galera/r/MW-284.result

 connection node_2;
 connection node_1;
 connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
-call mtr.add_suppression("\\[ERROR\\] Error reading packet from server: WSREP has not yet prepared node for application use .*");
+call mtr.add_suppression("\\[ERROR\\] Error reading packet from server: WSREP has not yet prepared node for application use ");
 call mtr.add_suppression("WSREP has not yet prepared node for application use");
 connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;

mysql-test/suite/galera/r/MW-329.result

 connection node_2;
 connection node_1;
-CALL mtr.add_suppression("WSREP: .*conflict state . after post commit .*");
 CREATE TABLE t1 (f1 INTEGER, f2 CHAR(20) DEFAULT 'abc') ENGINE=InnoDB;
 INSERT INTO t1 (f1) VALUES (1),(65535);
 CREATE PROCEDURE proc_insert ()
@@ -19,5 +18,5 @@ connection node_1b;
 connection node_1;
 DROP PROCEDURE proc_insert;
 DROP TABLE t1;
-CALL mtr.add_suppression("conflict state 3 after post commit");
+CALL mtr.add_suppression("WSREP: .* conflict state after post commit ");
 set global innodb_status_output=Default;

mysql-test/suite/galera/r/galera#500.result

@@ -15,4 +15,4 @@ SET GLOBAL wsrep_provider_options="pc.bootstrap=1";
 connection node_2;
 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.");
+CALL mtr.add_suppression("WSREP: exception from gcomm, backend must be restarted: Gcomm backend termination was requested by setting gmcast\\.isolate=2\\.");

mysql-test/suite/galera/r/galera-features#117.result

@@ -34,7 +34,7 @@ SHOW TABLES IN test;
 Tables_in_test
 t1
 Killing server ...
-CALL mtr.add_suppression("Inconsistent by consensus.");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("WSREP: Failed to execute TOI action");
 CALL mtr.add_suppression("WSREP: TO isolation end failed");
 connection node_1;

mysql-test/suite/galera/r/galera_bf_abort_shutdown.result

@@ -5,7 +5,7 @@ connection node_2;
 connection node_1;
 CREATE TABLE t1 (f1 INT PRIMARY KEY);
 connection node_2;
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR continue';
 INSERT INTO t1 VALUES (1);
 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;

mysql-test/suite/galera/r/galera_desync_overlapped.result

 connection node_2;
 connection node_1;
 connection node_1;
-CREATE TABLE ten (f1 INTEGER);
+CREATE TABLE ten (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
 INSERT INTO ten VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 CREATE TABLE t1 (f1 INTEGER, PRIMARY KEY (f1)) Engine=InnoDB;
 CREATE TABLE t2 (f1 INTEGER, PRIMARY KEY (f1)) Engine=InnoDB;
@@ -12,6 +12,7 @@ wsrep_desync_count	1
 SET DEBUG_SYNC='before_execute_sql_command SIGNAL alter1 WAIT_FOR alter2';
 INSERT INTO t1 (f1) SELECT 0000 + (100 * a1.f1) + (10 * a2.f1) + a3.f1 FROM ten AS a1, ten AS a2, ten AS a3;
 connection node_1a;
+FLUSH STATUS;
 SET GLOBAL wsrep_desync = 1;
 Warnings:
 Warning	1231	'wsrep_desync' is already ON.
@@ -35,6 +36,7 @@ Warning	1231	'wsrep_desync' is already OFF.
 show status like 'wsrep_desync_count';
 Variable_name	Value
 wsrep_desync_count	0
+call mtr.add_suppression("Trying to make wsrep_desync = OFF on the node that is already synchronized\\.");
 show status like 'wsrep_desync_count';
 Variable_name	Value
 wsrep_desync_count	0

mysql-test/suite/galera/r/galera_drop_database.result

@@ -48,6 +48,6 @@ SHOW TABLES;
 Tables_in_fts
 DROP DATABASE fts;
 connection node_2;
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 Warnings:
 Note	1049	Unknown database 'fts'

mysql-test/suite/galera/r/galera_drop_multi.result

@@ -19,6 +19,6 @@ SHOW CREATE TABLE t3;
 ERROR 42S02: Table 'test.t3' doesn't exist
 SHOW CREATE TABLE t4;
 ERROR 42S02: Table 'test.t4' doesn't exist
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test.t2,test.t4'' on query\. Default database: 'test'\. Query: 'DROP TABLE t1, t2, t3, t4', Error_code: 1051");
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test\\.t2,test\\.t4'' on query\\. Default database: 'test'\\. Query: 'DROP TABLE t1, t2, t3, t4', Error_code: 1051");
 connection node_1;
 DROP TABLE t5;

mysql-test/suite/galera/r/galera_events2.result

@@ -111,7 +111,7 @@ f1	f2
 SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_DEFINITION, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_NAME='one_event';
 EVENT_CATALOG	EVENT_SCHEMA	EVENT_NAME	DEFINER	EVENT_BODY	EVENT_DEFINITION	EVENT_TYPE	EXECUTE_AT	INTERVAL_VALUE	INTERVAL_FIELD	STATUS	ON_COMPLETION	EVENT_COMMENT
 def	test	one_event	root@localhost	SQL	SELECT 123	RECURRING	NULL	10	SECOND	SLAVESIDE_DISABLED	NOT PRESERVE	
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 connection node_1;
 SELECT * FROM t1;
 f1	f2

mysql-test/suite/galera/r/galera_forced_binlog_format_ctas.result

 connection node_2;
 connection node_1;
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since.*");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since ");
 SET GLOBAL wsrep_forced_binlog_format=ROW;
 connection node_1;
 CREATE TABLE t1(a int not null primary key auto_increment, b int) ENGINE=InnoDB;

mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result

@@ -94,7 +94,6 @@ CALL insert_1m ();;
 connection node_1_insert_10m;
 CALL insert_10m ();;
 connection node_2;
-call mtr.add_suppression("Error in Log_event::read_log_event\(\):.*");
 SET SESSION wsrep_sync_wait = 0;
 Killing server ...
 connection node_1;
@@ -131,9 +130,9 @@ DROP PROCEDURE update_simple;
 DROP PROCEDURE insert_1k;
 DROP PROCEDURE insert_1m;
 connection node_1;
-call mtr.add_suppression("Error in Log_event::read_log_event\(\):.*");
+call mtr.add_suppression("Error in Log_event::read_log_event\\(\\)");
 CALL mtr.add_suppression("conflict state 7 after post commit");
 CALL mtr.add_suppression("Skipped GCache ring buffer recovery");
 connection node_2;
-call mtr.add_suppression("Error in Log_event::read_log_event\(\):.*");
+call mtr.add_suppression("Error in Log_event::read_log_event\\(\\)");
 CALL mtr.add_suppression("Skipped GCache ring buffer recovery");

mysql-test/suite/galera/r/galera_gra_log.result

@@ -35,4 +35,4 @@ ROLLBACK /* added by mysqlbinlog */;
 Killing server ...
 SET GLOBAL wsrep_ignore_apply_errors = 7;
 DROP TABLE t1;
-CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");

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

mysql-test/suite/galera/r/galera_ist_mysqldump.result

 connection node_2;
 connection node_1;
 Setting SST method to mysqldump ...
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
-call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127\\.0\\.0\\.1'");
+call mtr.add_suppression("Failed to load slave replication state from table mysql\\.gtid_slave_pos");
 connection node_1;
 CREATE USER 'sst';
 GRANT ALL PRIVILEGES ON *.* TO 'sst';
 SET GLOBAL wsrep_sst_auth = 'sst:';
 connection node_2;
 SET GLOBAL wsrep_sst_method = 'mysqldump';
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to ");
 connection node_1;
 connection node_2;
 Performing State Transfer on a server that has been shut down cleanly and restarted
@@ -364,4 +364,4 @@ CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
 CALL mtr.add_suppression("Info table is not ready to be used");
 CALL mtr.add_suppression("Native table .* has the wrong structure");
-CALL mtr.add_suppression("Table \'mysql.gtid_slave_pos\' doesn\'t exist");
+CALL mtr.add_suppression("Table 'mysql\\.gtid_slave_pos' doesn't exist");

mysql-test/suite/galera/r/galera_kill_ddl.result

@@ -3,7 +3,7 @@ connection node_1;
 connection node_1;
 connection node_2;
 connection node_1;
-call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*");
+call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member ");
 SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true';
 CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 connection node_2;

mysql-test/suite/galera/r/galera_partition.result

 connection node_2;
 connection node_1;
 connection node_1;
-call mtr.add_suppression("WSREP: RSU failed due to pending transactions, schema: test, query ALTER.*");
+call mtr.add_suppression("WSREP: RSU failed due to pending transactions, schema: test, query ALTER");
 call mtr.add_suppression("WSREP: ALTER TABLE isolation failure");
 connection node_1;
 CREATE TABLE t1(

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;

mysql-test/suite/galera/r/galera_replica_no_gtid.result

@@ -37,7 +37,7 @@ connection node_2;
 # Start node_2 again
 ¤ Wait until node_2 is back on cluster
 connection node_2;
-call mtr.add_suppression("Slave: Operation CREATE USER failed for .*");
+call mtr.add_suppression("Slave: Operation CREATE USER failed for ");
 SELECT COUNT(*) AS EXPECT_0 FROM mysql.gtid_slave_pos;
 EXPECT_0
 0

mysql-test/suite/galera/r/galera_restart_on_unknown_option.result

@@ -41,7 +41,7 @@ f1	f2
 connection node_2;
 Starting server ...
 Starting server ...
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 SELECT * FROM t1;
 f1	f2
 1	a

mysql-test/suite/galera/r/galera_ssl_compression.result

@@ -24,5 +24,5 @@ COUNT(*) = 1
 1
 connection node_1;
 DROP TABLE t1;
-CALL mtr.add_suppression("Unknown parameter 'socket\.ssl_compression'");
+CALL mtr.add_suppression("Unknown parameter 'socket\\.ssl_compression'");
 CALL mtr.add_suppression("Set options returned 7");

mysql-test/suite/galera/r/galera_ssl_upgrade.result

 connection node_2;
 connection node_1;
 connection node_1;
-call mtr.add_suppression("WSREP: write_handler().*");
-connection node_2;
-call mtr.add_suppression("WSREP: write_handler():.*");
-connection node_1;
 connection node_2;
 connection node_1;
 connection node_2;
@@ -28,6 +24,6 @@ VARIABLE_VALUE = 2
 1
 connection node_2;
 connection node_1;
-call mtr.add_suppression("WSREP: write_handler().*");
+call mtr.add_suppression("WSREP: write_handler\\(\\)");
 connection node_2;
-call mtr.add_suppression("WSREP: write_handler():.*");
+call mtr.add_suppression("WSREP: write_handler\\(\\)");

mysql-test/suite/galera/r/galera_sst_mysqldump.result

 connection node_2;
 connection node_1;
 Setting SST method to mysqldump ...
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
-call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127\\.0\\.0\\.1'");
+call mtr.add_suppression("Failed to load slave replication state from table mysql\\.gtid_slave_pos");
 connection node_1;
 CREATE USER 'sst';
 GRANT ALL PRIVILEGES ON *.* TO 'sst';
@@ -708,4 +708,4 @@ CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
 CALL mtr.add_suppression("Info table is not ready to be used");
 CALL mtr.add_suppression("Native table .* has the wrong structure");
-CALL mtr.add_suppression("Table \'mysql.gtid_slave_pos\' doesn\'t exist");
+CALL mtr.add_suppression("Table 'mysql\\.gtid_slave_pos' doesn't exist");

mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result

 connection node_2;
 connection node_1;
 Setting SST method to mysqldump ...
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
-call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127\\.0\\.0\\.1'");
+call mtr.add_suppression("Failed to load slave replication state from table mysql\\.gtid_slave_pos");
 connection node_1;
 CREATE USER 'sst';
 GRANT ALL PRIVILEGES ON *.* TO 'sst';
@@ -368,5 +368,5 @@ CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
 CALL mtr.add_suppression("Info table is not ready to be used");
 CALL mtr.add_suppression("Native table .* has the wrong structure");
-CALL mtr.add_suppression("Table \'mysql.gtid_slave_pos\' doesn\'t exist");
+CALL mtr.add_suppression("Table 'mysql\\.gtid_slave_pos' doesn't exist");
 DROP USER sslsst;

mysql-test/suite/galera/r/galera_toi_ddl_error.result

@@ -21,6 +21,6 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 DROP TABLE ten;
-CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query.");
+CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query\\.");
 connection node_2;
-CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query.");
+CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query\\.");

mysql-test/suite/galera/r/galera_var_ignore_apply_errors.result

@@ -178,9 +178,9 @@ connection node_2;
 SET GLOBAL wsrep_ignore_apply_errors = 7;
 CALL mtr.add_suppression("Can't find record in 't.*'");
 CALL mtr.add_suppression("Slave SQL: Could not execute Delete_rows event");
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test.t1'' on query. Default database: 'test'. Query: 'DROP TABLE t1', Error_code: 1051");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't drop database 's1'; database doesn't exist' on query. Default database: 'test'. Query: 'DROP SCHEMA s1', Error_code: 1008");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query. Default database: 'test'. Query: 'DROP INDEX idx1 ON t1', Error_code: 1091");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t1 DROP INDEX idx1', Error_code: 1091");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'f2'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t1 DROP COLUMN f2', Error_code: 1091");
-CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query.");
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test\\.t1'' on query\\. Default database: 'test'\\. Query: 'DROP TABLE t1', Error_code: 1051");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't drop database 's1'; database doesn't exist' on query\\. Default database: 'test'\\. Query: 'DROP SCHEMA s1', Error_code: 1008");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query\\. Default database: 'test'\\. Query: 'DROP INDEX idx1 ON t1', Error_code: 1091");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query\\. Default database: 'test'\\. Query: 'ALTER TABLE t1 DROP INDEX idx1', Error_code: 1091");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'f2'; check that column/key exists' on query\\. Default database: 'test'\\. Query: 'ALTER TABLE t1 DROP COLUMN f2', Error_code: 1091");
+CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query\\.");

mysql-test/suite/galera/r/galera_var_slave_threads.result

@@ -6,7 +6,7 @@ connection node_1;
 CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB;
 CREATE TABLE t2 (f1 INT AUTO_INCREMENT PRIMARY KEY) Engine=InnoDB;
 connection node_2;
-CALL mtr.add_suppression("WSREP: Refusing exit for the last slave thread.");
+CALL mtr.add_suppression("WSREP: Refusing exit for the last slave thread\\.");
 SET GLOBAL wsrep_slave_threads = 0;
 Warnings:
 Warning	1292	Truncated incorrect wsrep_slave_threads value: '0'

mysql-test/suite/galera/r/galera_var_wsrep_start_position.result

@@ -3,7 +3,7 @@ connection node_1;
 #
 # wsrep_start_position
 #
-CALL mtr.add_suppression("WSREP: SST failed for position .*");
+CALL mtr.add_suppression("WSREP: SST failed for position ");
 SET @wsrep_start_position_global_saved = @@global.wsrep_start_position;
 # default
 SELECT @@global.wsrep_start_position;

mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result

@@ -53,7 +53,7 @@ expect_0
 SELECT COUNT(*) AS expect_1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2';
 expect_1
 1
-CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group. Leaving cluster.");
+CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group\\. Leaving cluster\\.");
 connection node_4;
 SELECT COUNT(*) AS expect_0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 expect_0
@@ -61,7 +61,7 @@ expect_0
 SELECT COUNT(*) AS expect_1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2';
 expect_1
 1
-CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group. Leaving cluster.");
+CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group\\. Leaving cluster\\.");
 DROP TABLE t2;
 disconnect node_3;
 disconnect node_4;

mysql-test/suite/galera/r/galera_wan.result

 connection node_2;
 connection node_1;
-CALL mtr.add_suppression("WSREP: Stray state UUID msg:.*");
-CALL mtr.add_suppression("WSREP: Sending JOIN failed:.*");
+CALL mtr.add_suppression("WSREP: Stray state UUID msg:");
+CALL mtr.add_suppression("Sending JOIN failed: ");
+CALL mtr.add_suppression("WSREP: .* sending install message failed: Socket is not connected");
 CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
-call mtr.add_suppression("WSREP: Sending JOIN failed:.*");
 SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 4
 1

mysql-test/suite/galera/r/galera_wsrep_provider_options_syntax.result

 connection node_2;
 connection node_1;
-call mtr.add_suppression("WSREP\: Unknown parameter 'gmcasts\.segment'");
+call mtr.add_suppression("WSREP\: Unknown parameter 'gmcasts\\.segment'");
 call mtr.add_suppression("WSREP\: Set options returned 7");
 SET GLOBAL wsrep_provider_options="gmcasts.segment=1";
 ERROR HY000: Incorrect arguments to SET

mysql-test/suite/galera/r/mdev-28433.result

@@ -19,7 +19,7 @@ wsrep_ready	OFF
 SHOW STATUS LIKE 'wsrep_cluster_status';
 Variable_name	Value
 wsrep_cluster_status	Disconnected
-call mtr.add_suppression("WSREP: .*Invalid backend URI.*");
+call mtr.add_suppression("WSREP: .*Invalid backend URI");
 call mtr.add_suppression("WSREP: gcs connect failed: Invalid argument");
 disconnect node_2;
 disconnect node_1;

mysql-test/suite/galera/r/mdev-31651.result

 connection node_2;
 connection node_1;
-call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not read field.*");
-call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not execute Write_rows_v1 event on table.*");
+call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not read field");
+call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not execute Write_rows_v1 event on table");
 CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b INT, KEY(b)) engine=innodb;
 BINLOG 'AMqaOw8BAAAAdAAAAHgAAAAAAAQANS42LjM0LTc5LjEtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAEzgNAAgAEgAEBAQEEgAAXAAEGggAAAAICAgCAAAACgoKGRkAAYVx w2w=';
 BINLOG 'wlZOTxMBAAAAKgAAADwCAAAAACkAAAAAAAEABHRlc3QAAnQxAAIDAwAC wlZOTxcBAAAAJgAAAGICAAAAACkAAAAAAAEAAv/8AgAAAAgAAAA=';

mysql-test/suite/galera/r/mysql-wsrep#33.result

@@ -3,8 +3,8 @@ connection node_1;
 connection node_1;
 connection node_2;
 Setting SST method to mysqldump ...
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
-call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127\\.0\\.0\\.1'");
+call mtr.add_suppression("Failed to load slave replication state from table mysql\\.gtid_slave_pos");
 connection node_1;
 CREATE USER 'sst';
 GRANT ALL PRIVILEGES ON *.* TO 'sst';
@@ -709,6 +709,6 @@ CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
 CALL mtr.add_suppression("Info table is not ready to be used");
 CALL mtr.add_suppression("Native table .* has the wrong structure");
-CALL mtr.add_suppression("Table \'mysql.gtid_slave_pos\' doesn\'t exist");
+CALL mtr.add_suppression("Table 'mysql\\.gtid_slave_pos' doesn't exist");
 SET GLOBAL general_log = ON;
 SET GLOBAL slow_query_log = ON;

mysql-test/suite/galera/r/versioning_trx_id.result

 connection node_2;
 connection node_1;
-call mtr.add_suppression("Sending JOIN failed:.*");
+call mtr.add_suppression("Sending JOIN failed: ");
 connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 connection node_1;
 create table t1 (a int, s bigint unsigned as row start, e bigint unsigned as row end, period for system_time(s,e)) engine=InnoDB with system versioning;

mysql-test/suite/galera/t/GAL-401.test

@@ -48,7 +48,7 @@ SET @@global.wsrep_desync = 0;
 SET SESSION wsrep_sync_wait=15;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
-CALL mtr.add_suppression("WSREP: Protocol violation. JOIN message sender (.*) is not in state transfer \\(SYNCED\\). Message ignored.");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender (.*) is not in state transfer \\(SYNCED\\)\\. Message ignored\\.");
 
 --connection node_1
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';

mysql-test/suite/galera/t/GAL-419.test

@@ -5,11 +5,12 @@
 --source include/galera_cluster.inc
 --source include/big_test.inc
 
-call mtr.add_suppression("WSREP: It may not be safe to bootstrap the cluster from this node.*");
+call mtr.add_suppression("WSREP: It may not be safe to bootstrap the cluster from this node");
 call mtr.add_suppression("Aborting");
-call mtr.add_suppression("Plugin \'wsrep\' init function returned error.");
-call mtr.add_suppression("Plugin \'wsrep\' registration as a STORAGE ENGINE failed.");
-call mtr.add_suppression("Failed to initialize plugins.");
+call mtr.add_suppression("Plugin 'wsrep' init function returned error");
+call mtr.add_suppression("Plugin 'wsrep' registration as a STORAGE ENGINE failed");
+call mtr.add_suppression("Plugin 'wsrep' registration as a FUNCTION failed");
+call mtr.add_suppression("Failed to initialize plugins");
 
 --connection node_2
 SET SESSION wsrep_sync_wait = 0;

mysql-test/suite/galera/t/GCF-939.test

@@ -25,7 +25,6 @@ INSERT INTO t1 VALUES (1);
 --list_files $MYSQLTEST_VARDIR/mysqld.2/data GRA_*.log
 
 DROP TABLE t1;
-CALL mtr.add_suppression("Ignoring error 'Unknown table 'test.t1'' on query");
+CALL mtr.add_suppression("Ignoring error 'Unknown table 'test\\.t1'' on query");
 --connection node_2
-CALL mtr.add_suppression("Error 'Unknown table 'test.t1'' on query");
-
+CALL mtr.add_suppression("Error 'Unknown table 'test\\.t1'' on query");

mysql-test/suite/galera/t/MDEV-21479.test

@@ -77,7 +77,7 @@ SET @@global.wsrep_desync = 0;
 --let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
 --source include/wait_condition.inc
 
-CALL mtr.add_suppression("WSREP: Protocol violation. JOIN message sender (.*) is not in state transfer \\(SYNCED\\). Message ignored.");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender (.*) is not in state transfer \\(SYNCED\\)\\. Message ignored\\.");
 
 --connection node_1
 --echo # Wait until both nodes are back to cluster

mysql-test/suite/galera/t/MDEV-26575.test

@@ -6,7 +6,7 @@
 --source include/galera_cluster.inc
 
 --connection node_2
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 --connection node_1
 
 # Save original auto_increment_offset values.

mysql-test/suite/galera/t/MDEV-29142.test

@@ -8,15 +8,15 @@
 --source include/auto_increment_offset_save.inc
 
 --connection node_1
-call mtr.add_suppression("WSREP: Event .* Write_rows_v1 apply failed:.*");
-call mtr.add_suppression("WSREP: Failed to apply write set:.*");
-call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on.*");
+call mtr.add_suppression("WSREP: Event .* Write_rows_v1 apply failed: ");
+call mtr.add_suppression("WSREP: Failed to apply write set: ");
+call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 
 --connection node_2
-call mtr.add_suppression("WSREP: Failed to open table mysql.wsrep_streaming_log for writing");
+call mtr.add_suppression("WSREP: Failed to open table mysql\\.wsrep_streaming_log for writing");
 call mtr.add_suppression("WSREP: Failed to open SR table for write");
 call mtr.add_suppression("WSREP: Failed to recover SR transactions from schema: wsrep_on : 0");
-call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on.*");
+call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 
 SET @@global.tx_read_only = ON;
 --error 0,1286
@@ -59,7 +59,7 @@ SET SESSION wsrep_sync_wait = 0;
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
 --source include/start_mysqld.inc
 
-call mtr.add_suppression("WSREP: Failed to open table mysql.wsrep_streaming_log for writing");
+call mtr.add_suppression("WSREP: Failed to open table mysql\\.wsrep_streaming_log for writing");
 call mtr.add_suppression("WSREP: Failed to open SR table for write");
 call mtr.add_suppression("WSREP: Failed to recover SR transactions from schema: wsrep_on : 0");
 

mysql-test/suite/galera/t/MW-284.test

@@ -6,7 +6,7 @@
 --source include/galera_cluster.inc
 
 --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
-call mtr.add_suppression("\\[ERROR\\] Error reading packet from server: WSREP has not yet prepared node for application use .*");
+call mtr.add_suppression("\\[ERROR\\] Error reading packet from server: WSREP has not yet prepared node for application use ");
 call mtr.add_suppression("WSREP has not yet prepared node for application use");
 
 --disable_query_log

mysql-test/suite/galera/t/MW-329.test

@@ -5,7 +5,6 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
-CALL mtr.add_suppression("WSREP: .*conflict state . after post commit .*");
 CREATE TABLE t1 (f1 INTEGER, f2 CHAR(20) DEFAULT 'abc') ENGINE=InnoDB;
 
 # We start with a populated table
@@ -78,7 +77,6 @@ while ($count)
 --eval SELECT $wsrep_local_replays_new - $wsrep_local_replays_old > 0 AS wsrep_local_replays;
 --enable_query_log
 
-
 #
 # Terminate the stored procedure
 #
@@ -99,6 +97,6 @@ DROP PROCEDURE proc_insert;
 DROP TABLE t1;
 
 # Due to MW-330, Multiple "conflict state 3 after post commit" warnings if table is dropped while SP is running
-CALL mtr.add_suppression("conflict state 3 after post commit");
+CALL mtr.add_suppression("WSREP: .* conflict state after post commit ");
 
-set global innodb_status_output=Default;
+set global innodb_status_output=Default;
\ No newline at end of file

mysql-test/suite/galera/t/MW-369.test

@@ -340,4 +340,3 @@ SELECT * FROM cg;
 
 DROP TABLE cg;
 DROP TABLE pg;
-

mysql-test/suite/galera/t/enforce_storage_engine2.cnf

@@ -7,7 +7,3 @@ sql_mode=''
 [mysqld.2]
 enforce_storage_engine=innodb
 sql_mode=''
-
-
-
-

mysql-test/suite/galera/t/galera#414.cnf

@@ -5,4 +5,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcs.max_packet_size=2'
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcs.max_packet_size=2'
-

mysql-test/suite/galera/t/galera#500.test

@@ -40,6 +40,6 @@ SET SESSION wsrep_on=0;
 --source include/restart_mysqld.inc
 
 --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.");
+CALL mtr.add_suppression("WSREP: exception from gcomm, backend must be restarted: Gcomm backend termination was requested by setting gmcast\\.isolate=2\\.");
 
 --source include/auto_increment_offset_restore.inc

mysql-test/suite/galera/t/galera-features#117.test

@@ -38,7 +38,7 @@ SHOW TABLES IN test;
 --source include/wait_until_disconnected.inc
 --source include/start_mysqld.inc
 
-CALL mtr.add_suppression("Inconsistent by consensus.");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("WSREP: Failed to execute TOI action");
 CALL mtr.add_suppression("WSREP: TO isolation end failed");
 

mysql-test/suite/galera/t/galera_bf_abort_shutdown.test

@@ -18,7 +18,7 @@
 CREATE TABLE t1 (f1 INT PRIMARY KEY);
 
 --connection node_2
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR continue';
 --send INSERT INTO t1 VALUES (1)
 

mysql-test/suite/galera/t/galera_defaults.test

@@ -13,7 +13,7 @@
 --source include/force_restart.inc
 
 # Make sure that the test is operating on the right version of galera library.
---let $galera_version=26.4.7
+--let $galera_version=26.4.8
 source ../wsrep/include/check_galera_version.inc;
 
 # Global Variables

mysql-test/suite/galera/t/galera_desync_overlapped.test

@@ -11,7 +11,7 @@
 
 --connection node_1
 
-CREATE TABLE ten (f1 INTEGER);
+CREATE TABLE ten (f1 INTEGER PRIMARY KEY) Engine=InnoDB;
 INSERT INTO ten VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
 CREATE TABLE t1 (f1 INTEGER, PRIMARY KEY (f1)) Engine=InnoDB;
@@ -24,6 +24,7 @@ send INSERT INTO t1 (f1) SELECT 0000 + (100 * a1.f1) + (10 * a2.f1) + a3.f1 FROM
 
 --connection node_1a
 
+FLUSH STATUS;
 SET GLOBAL wsrep_desync = 1;
 show status like 'wsrep_desync_count';
 SET DEBUG_SYNC='now WAIT_FOR alter1';
@@ -45,9 +46,7 @@ show status like 'wsrep_desync_count';
 SET GLOBAL wsrep_desync = 0;
 show status like 'wsrep_desync_count';
 
---disable_query_log
-call mtr.add_suppression("Trying to make wsrep_desync = OFF on the node that is already synchronized.");
---enable_query_log
+call mtr.add_suppression("Trying to make wsrep_desync = OFF on the node that is already synchronized\\.");
 show status like 'wsrep_desync_count';
 SET GLOBAL wsrep_desync = 0;
 

mysql-test/suite/galera/t/galera_drop_database.test

@@ -56,7 +56,7 @@ SHOW TABLES;
 DROP DATABASE fts;
 
 --connection node_2
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'fts_t1';
 --source include/wait_condition.inc
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'fts_t2';

mysql-test/suite/galera/t/galera_drop_multi.test

@@ -35,7 +35,7 @@ SHOW CREATE TABLE t3;
 --error ER_NO_SUCH_TABLE
 SHOW CREATE TABLE t4;
 
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test.t2,test.t4'' on query\. Default database: 'test'\. Query: 'DROP TABLE t1, t2, t3, t4', Error_code: 1051");
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test\\.t2,test\\.t4'' on query\\. Default database: 'test'\\. Query: 'DROP TABLE t1, t2, t3, t4', Error_code: 1051");
 
 --connection node_1
 DROP TABLE t5;

mysql-test/suite/galera/t/galera_events2.test

@@ -137,7 +137,7 @@ SELECT * FROM t1;
 --echo # node_2 Event should be SERVERSIDE_DISABLED
 SELECT EVENT_CATALOG, EVENT_SCHEMA, EVENT_NAME, DEFINER, EVENT_BODY, EVENT_DEFINITION, EVENT_TYPE, EXECUTE_AT, INTERVAL_VALUE, INTERVAL_FIELD, STATUS,ON_COMPLETION, EVENT_COMMENT FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_NAME='one_event';
 
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 
 --connection node_1
 SELECT * FROM t1;

mysql-test/suite/galera/t/galera_fk_truncate.test

 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 CREATE TABLE author (
   id SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,

mysql-test/suite/galera/t/galera_forced_binlog_format_ctas.test

 --source include/galera_cluster.inc
 
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since.*");
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since ");
 
 SET GLOBAL wsrep_forced_binlog_format=ROW;
 

mysql-test/suite/galera/t/galera_gcache_recover_manytrx.test

@@ -126,7 +126,6 @@ DELIMITER ;|
 --send CALL insert_10m ();
 
 --connection node_2
-call mtr.add_suppression("Error in Log_event::read_log_event\(\):.*");
 SET SESSION wsrep_sync_wait = 0;
 
 # Make sure that node_2 is not killed while TOIs are applied.
@@ -200,12 +199,12 @@ DROP PROCEDURE insert_1k;
 DROP PROCEDURE insert_1m;
 
 --connection node_1
-call mtr.add_suppression("Error in Log_event::read_log_event\(\):.*");
+call mtr.add_suppression("Error in Log_event::read_log_event\\(\\)");
 CALL mtr.add_suppression("conflict state 7 after post commit");
 
 # Warning happens when the cluster is started for the first time
 CALL mtr.add_suppression("Skipped GCache ring buffer recovery");
 
 --connection node_2
-call mtr.add_suppression("Error in Log_event::read_log_event\(\):.*");
+call mtr.add_suppression("Error in Log_event::read_log_event\\(\\)");
 CALL mtr.add_suppression("Skipped GCache ring buffer recovery");

mysql-test/suite/galera/t/galera_gra_log.test

@@ -43,7 +43,7 @@ CREATE TABLE t1 (f1 INTEGER);
 --eval SET GLOBAL wsrep_ignore_apply_errors = $restore_wsrep_ignore_apply_errors
 DROP TABLE t1;
 
-CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 
 # Restore original auto_increment_offset values.
 --source include/auto_increment_offset_restore.inc

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

mysql-test/suite/galera/t/galera_ist_mysqldump.test

@@ -4,7 +4,7 @@
 
 --source suite/galera/include/galera_sst_set_mysqldump.inc
 
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to ");
 
 --let $node_1=node_1
 --let $node_2=node_2

mysql-test/suite/galera/t/galera_ist_restart_joiner.test

@@ -96,4 +96,3 @@ DROP TABLE t1;
 --source include/auto_increment_offset_restore.inc
 
 --source include/galera_end.inc
-

mysql-test/suite/galera/t/galera_kill_ddl.test

@@ -11,7 +11,7 @@
 --source include/auto_increment_offset_save.inc
 
 --connection node_1
-call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*");
+call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member ");
 
 # Enable the master to continue running during the split-brain situation that
 # occurs when the slave is killed

mysql-test/suite/galera/t/galera_partition.test

@@ -6,7 +6,7 @@
 
 --connection node_1
 
-call mtr.add_suppression("WSREP: RSU failed due to pending transactions, schema: test, query ALTER.*");
+call mtr.add_suppression("WSREP: RSU failed due to pending transactions, schema: test, query ALTER");
 call mtr.add_suppression("WSREP: ALTER TABLE isolation failure");
 
 --connection node_1
@@ -438,6 +438,3 @@ reap;
 --connection node_1
 DROP TABLE t1;
 DROP PROCEDURE p1;
-
-
-

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
 

mysql-test/suite/galera/t/galera_replica_no_gtid.test

@@ -87,7 +87,7 @@ SELECT COUNT(*) AS EXPECT_10000 FROM t1;
 --source include/wait_condition.inc
 
 --connection node_2
-call mtr.add_suppression("Slave: Operation CREATE USER failed for .*");
+call mtr.add_suppression("Slave: Operation CREATE USER failed for ");
 SELECT COUNT(*) AS EXPECT_0 FROM mysql.gtid_slave_pos;
 SELECT COUNT(*) AS EXPECT_10000 FROM t1;
 

mysql-test/suite/galera/t/galera_restart_on_unknown_option.test

@@ -125,7 +125,7 @@ SELECT * FROM t1;
 
 # Sanity check (node 2 is running now and can perform SQL operators):
 
-call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:");
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end\\. Last events may be missing\\. Last recovered event: ");
 SELECT * FROM t1;
 
 --connection node_1

mysql-test/suite/galera/t/galera_ssl_compression.test

@@ -31,5 +31,5 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = REPEAT('a', 333) AND f2 = REPEAT('b', 655
 --connection node_1
 DROP TABLE t1;
 
-CALL mtr.add_suppression("Unknown parameter 'socket\.ssl_compression'");
+CALL mtr.add_suppression("Unknown parameter 'socket\\.ssl_compression'");
 CALL mtr.add_suppression("Set options returned 7");

mysql-test/suite/galera/t/galera_ssl_upgrade.test

@@ -8,11 +8,6 @@
 --source include/have_innodb.inc
 --source include/have_ssl_communication.inc
 
---connection node_1
-call mtr.add_suppression("WSREP: write_handler().*");
---connection node_2
-call mtr.add_suppression("WSREP: write_handler():.*");
-
 # Save original auto_increment_offset values.
 --let $node_1=node_1
 --let $node_2=node_2
@@ -77,7 +72,6 @@ SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_N
 --source include/auto_increment_offset_restore.inc
 
 --connection node_1
-call mtr.add_suppression("WSREP: write_handler().*");
+call mtr.add_suppression("WSREP: write_handler\\(\\)");
 --connection node_2
-call mtr.add_suppression("WSREP: write_handler():.*");
-
+call mtr.add_suppression("WSREP: write_handler\\(\\)");

mysql-test/suite/galera/t/galera_toi_ddl_error.test

@@ -28,7 +28,7 @@ SHOW CREATE TABLE t1;
 DROP TABLE t1;
 DROP TABLE ten;
 
-CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query.");
+CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query\\.");
 
 --connection node_2
-CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query.");
+CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query\\.");
\ No newline at end of file

mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test

@@ -277,15 +277,14 @@ SET GLOBAL wsrep_on = ON;
 CREATE TABLE t1 (f1 INTEGER, f2 INTEGER);
 DROP TABLE t1;
 
-
 --connection node_2
 SET GLOBAL wsrep_ignore_apply_errors = 7;
 
 CALL mtr.add_suppression("Can't find record in 't.*'");
 CALL mtr.add_suppression("Slave SQL: Could not execute Delete_rows event");
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test.t1'' on query. Default database: 'test'. Query: 'DROP TABLE t1', Error_code: 1051");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't drop database 's1'; database doesn't exist' on query. Default database: 'test'. Query: 'DROP SCHEMA s1', Error_code: 1008");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query. Default database: 'test'. Query: 'DROP INDEX idx1 ON t1', Error_code: 1091");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t1 DROP INDEX idx1', Error_code: 1091");
-CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'f2'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t1 DROP COLUMN f2', Error_code: 1091");
-CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query.");
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table 'test\\.t1'' on query\\. Default database: 'test'\\. Query: 'DROP TABLE t1', Error_code: 1051");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't drop database 's1'; database doesn't exist' on query\\. Default database: 'test'\\. Query: 'DROP SCHEMA s1', Error_code: 1008");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query\\. Default database: 'test'\\. Query: 'DROP INDEX idx1 ON t1', Error_code: 1091");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'idx1'; check that column/key exists' on query\\. Default database: 'test'\\. Query: 'ALTER TABLE t1 DROP INDEX idx1', Error_code: 1091");
+CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'f2'; check that column/key exists' on query\\. Default database: 'test'\\. Query: 'ALTER TABLE t1 DROP COLUMN f2', Error_code: 1091");
+CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query\\.");

mysql-test/suite/galera/t/galera_var_slave_threads.test

@@ -19,7 +19,7 @@ CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB;
 CREATE TABLE t2 (f1 INT AUTO_INCREMENT PRIMARY KEY) Engine=InnoDB;
 
 --connection node_2
-CALL mtr.add_suppression("WSREP: Refusing exit for the last slave thread.");
+CALL mtr.add_suppression("WSREP: Refusing exit for the last slave thread\\.");
 # Setting wsrep_slave_threads to zero triggers a warning
 SET GLOBAL wsrep_slave_threads = 0;
 SHOW WARNINGS;

mysql-test/suite/galera/t/galera_var_wsrep_start_position.test

@@ -4,7 +4,7 @@
 --echo # wsrep_start_position
 --echo #
 
-CALL mtr.add_suppression("WSREP: SST failed for position .*");
+CALL mtr.add_suppression("WSREP: SST failed for position ");
 
 SET @wsrep_start_position_global_saved = @@global.wsrep_start_position;
 --echo # default

mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test

@@ -82,12 +82,12 @@ CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
 --connection node_3
 SELECT COUNT(*) AS expect_0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 SELECT COUNT(*) AS expect_1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2';
-CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group. Leaving cluster.");
+CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group\\. Leaving cluster\\.");
 
 --connection node_4
 SELECT COUNT(*) AS expect_0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 SELECT COUNT(*) AS expect_1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2';
-CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group. Leaving cluster.");
+CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on .* is inconsistent with group\\. Leaving cluster\\.");
 
 DROP TABLE t2;
 

mysql-test/suite/galera/t/galera_wan.test

@@ -9,11 +9,10 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
-CALL mtr.add_suppression("WSREP: Stray state UUID msg:.*");
-CALL mtr.add_suppression("WSREP: Sending JOIN failed:.*");
+CALL mtr.add_suppression("WSREP: Stray state UUID msg:");
+CALL mtr.add_suppression("Sending JOIN failed: ");
+CALL mtr.add_suppression("WSREP: .* sending install message failed: Socket is not connected");
 CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
-call mtr.add_suppression("WSREP: Sending JOIN failed:.*");
-
 
 SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
@@ -37,4 +36,3 @@ SELECT VARIABLE_VALUE LIKE '%gmcast.segment = 3%' FROM INFORMATION_SCHEMA.GLOBAL
 SELECT COUNT(*) = 1 FROM t1;
 
 DROP TABLE t1;
-

mysql-test/suite/galera/t/galera_wsrep_provider_options_syntax.test

@@ -5,7 +5,7 @@
 --source include/have_innodb.inc
 --let LOGF=$MYSQLTEST_VARDIR/log/mysqld.1.err
 --disable_info
-call mtr.add_suppression("WSREP\: Unknown parameter 'gmcasts\.segment'");
+call mtr.add_suppression("WSREP\: Unknown parameter 'gmcasts\\.segment'");
 call mtr.add_suppression("WSREP\: Set options returned 7");
 --error ER_WRONG_ARGUMENTS  
 SET GLOBAL wsrep_provider_options="gmcasts.segment=1";

mysql-test/suite/galera/t/mdev-28433.test

@@ -26,7 +26,7 @@ SHOW STATUS LIKE 'wsrep_cluster_status';
 --enable_query_log
 --source include/wait_until_connected_again.inc
 --source include/galera_wait_ready.inc
-call mtr.add_suppression("WSREP: .*Invalid backend URI.*");
+call mtr.add_suppression("WSREP: .*Invalid backend URI");
 call mtr.add_suppression("WSREP: gcs connect failed: Invalid argument");
 
 # Restore original auto_increment_offset values.

mysql-test/suite/galera/t/mdev-31651.test

 --source include/galera_cluster.inc
 
-
-call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not read field.*");
-call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not execute Write_rows_v1 event on table.*");
+call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not read field");
+call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not execute Write_rows_v1 event on table");
 CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b INT, KEY(b)) engine=innodb;
 BINLOG 'AMqaOw8BAAAAdAAAAHgAAAAAAAQANS42LjM0LTc5LjEtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAEzgNAAgAEgAEBAQEEgAAXAAEGggAAAAICAgCAAAACgoKGRkAAYVx w2w=';
 --error ER_GET_ERRNO

mysql-test/suite/galera/t/versioning_trx_id.test

 --source include/galera_cluster.inc
 
-call mtr.add_suppression("Sending JOIN failed:.*");
+call mtr.add_suppression("Sending JOIN failed: ");
 
 --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
 

mysql-test/suite/galera_3nodes/disabled.def

@@ -13,7 +13,6 @@
 galera_2_cluster : MDEV-32631 galera_2_cluster: before_rollback(): Assertion `0' failed
 galera_gtid_2_cluster : MDEV-32633 galera_gtid_2_cluster: Assertion `thd->wsrep_next_trx_id() != (0x7fffffffffffffffLL * 2ULL + 1)'
 galera_ssl_reload : MDEV-32778 galera_ssl_reload failed with warning message
-galera_ipv6_mariabackup : temporarily disabled at the request of Codership
 galera_pc_bootstrap : temporarily disabled at the request of Codership
 galera_ipv6_mariabackup_section : temporarily disabled at the request of Codership
 # Opensuse/suse/rocky9/rocky84/rhel9/rhel8-ppc64le .. - all same IPv6 isn't configured right or skipping or galera

mysql-test/suite/galera_3nodes/include/galera_resume.inc

@@ -6,4 +6,3 @@
         system("kill -SIGCONT $mysqld_pid");
         exit(0);
 EOF
-

mysql-test/suite/galera_3nodes/r/GCF-354.result

@@ -43,13 +43,13 @@ Nodes 2 and 3 started
 connection node_2;
 USE test;
 Node 2 synced
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown database 'test'' on query. Default database: 'test'. Query: 'CREATE TABLE test.t1 \\\(f1 INTEGER\\\)', Error_code: 1049");
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown database 'test'' on query\\. Default database: 'test'\\. Query: 'CREATE TABLE test\\.t1 \\(f1 INTEGER\\)', Error_code: 1049");
 CALL mtr.add_suppression("Query apply failed");
-CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on .*");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
 connection node_3;
 Node 3 synced
-CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query. Default database: 'test'. Query: 'CREATE TABLE test.t1 \\\(f1 INTEGER\\\)', Error_code: 1050");
+CALL mtr.add_suppression("Slave SQL: Error 'Table 't1' already exists' on query\\. Default database: 'test'\\. Query: 'CREATE TABLE test\\.t1 \\(f1 INTEGER\\)', Error_code: 1050");
 CALL mtr.add_suppression("Query apply failed");
-CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on .*");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");

mysql-test/suite/galera_3nodes/r/GCF-363.result

@@ -37,13 +37,13 @@ f1	f2
 1	a
 DROP TABLE t1;
 connection node_1;
-CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log FIRST, end_log_pos 155, Error_code: 1062");
+CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test\\.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log FIRST, end_log_pos 155, Error_code: 1062");
 CALL mtr.add_suppression("WSREP: Event 3 Write_rows_v1 apply failed: 121, seqno ");
 connection node_2;
-CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log FIRST, end_log_pos 155, Error_code: 1062");
+CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test\\.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log FIRST, end_log_pos 155, Error_code: 1062");
 CALL mtr.add_suppression("WSREP: Event 3 Write_rows_v1 apply failed: 121, seqno ");
 connection node_3;
-CALL mtr.add_suppression("WSREP: Vote 0 \\\(success\\\) on (.*) is inconsistent with group. Leaving cluster.");
+CALL mtr.add_suppression("WSREP: Vote 0 \\(success\\) on (.*) is inconsistent with group\\. Leaving cluster\\.");
 CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
 connection node_1;

mysql-test/suite/galera_3nodes/r/GCF-376.result

@@ -86,6 +86,6 @@ DROP TABLE t1;
 connection node_2;
 CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log FIRST, end_log_pos (.*), Error_code: 1062");
 CALL mtr.add_suppression("WSREP: Event (.*) Write_rows_v1 apply failed: 121, seqno ");
-CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on (.*)");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
 CALL mtr.add_suppression("WSREP: Failed to apply write set: ");

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\\.");

mysql-test/suite/galera_3nodes/r/galera-features#119.result

@@ -25,8 +25,8 @@ connection node_2;
 Killing server ...
 # restart
 connection node_2;
-CALL mtr.add_suppression("Inconsistent by consensus.");
-CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log FIRST");
+CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on ");
+CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test\\.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log FIRST");
 CALL mtr.add_suppression("WSREP: Event 3 Write_rows_v1 apply failed: 121, seqno");
-CALL mtr.add_suppression("WSREP: Node consistency compromized, leaving cluster...");
+CALL mtr.add_suppression("WSREP: Node consistency compromized, leaving cluster\\.\\.\\.");
 CALL mtr.add_suppression("WSREP: Failed to apply write set: ");

mysql-test/suite/galera_3nodes/r/galera_evs_suspect_timeout.result

@@ -29,7 +29,7 @@ COUNT(*)
 connection node_3;
 Resuming node ...
 CALL mtr.add_suppression("WSREP: gcs_caused");
-CALL mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg");
+CALL mtr.add_suppression("WSREP: gcs/src/gcs_core\\.cpp:core_handle_uuid_msg");
 SET SESSION wsrep_sync_wait = 15;
 SELECT COUNT(*) FROM t1;
 COUNT(*)

mysql-test/suite/galera_3nodes/r/galera_garbd.result

@@ -26,8 +26,8 @@ DROP TABLE t1;
 Restarting node #3 to satisfy MTR's end-of-test checks
 connection node_3;
 connection node_1;
-CALL mtr.add_suppression("WSREP: Protocol violation\. JOIN message sender 1\.0 \(.*\) is not in state transfer \(SYNCED\)");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender 1\\.0 (.*) is not in state transfer \\(SYNCED\\)");
 connection node_2;
-CALL mtr.add_suppression("WSREP: Protocol violation\. JOIN message sender 1\.0 \(.*\) is not in state transfer \(SYNCED\)");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender 1\\.0 (.*) is not in state transfer \\(SYNCED\\)");
 connection node_3;
-CALL mtr.add_suppression("WSREP: Protocol violation\. JOIN message sender 1\.0 \(.*\) is not in state transfer \(SYNCED\)");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender 1\\.0 (.*) is not in state transfer \\(SYNCED\\)");

mysql-test/suite/galera_3nodes/r/galera_garbd_backup.result

@@ -34,8 +34,8 @@ Restarting node #3 to satisfy MTR's end-of-test checks
 connection node_3;
 connection node_1;
 connection node_1;
-CALL mtr.add_suppression("WSREP: Protocol violation\. JOIN message sender 1\.0 \(.*\) is not in state transfer \(SYNCED\)");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender 1\\.0 (.*) is not in state transfer \\(SYNCED\\)");
 connection node_2;
-CALL mtr.add_suppression("WSREP: Protocol violation\. JOIN message sender 1\.0 \(.*\) is not in state transfer \(SYNCED\)");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender 1\\.0 (.*) is not in state transfer \\(SYNCED\\)");
 connection node_3;
-CALL mtr.add_suppression("WSREP: Protocol violation\. JOIN message sender 1\.0 \(.*\) is not in state transfer \(SYNCED\)");
+CALL mtr.add_suppression("WSREP: Protocol violation\\. JOIN message sender 1\\.0 (.*) is not in state transfer \\(SYNCED\\)");

mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.result

@@ -197,16 +197,17 @@ COUNT(*)
 2750
 connection node_2;
 call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node");
-call mtr.add_suppression("WSREP: Sending JOIN failed:.*");
-call mtr.add_suppression("Sending JOIN failed:.*");
-call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST.*");
+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: Sending JOIN failed:.*");
-call mtr.add_suppression("Sending JOIN failed:.*");
-call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST.*");
+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");
 # cleanup
 connection node_1;
+call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration");
 DROP PROCEDURE insert_row;
 DROP TABLE t1;
 DROP TABLE t2;

mysql-test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result

 connection node_2;
 connection node_1;
-call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to'");
-call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127\\.0\\.0\\.1'");
+call mtr.add_suppression("Failed to load slave replication state from table mysql\\.gtid_slave_pos");
 connection node_1;
 connection node_2;
 connection node_3;
@@ -35,6 +35,6 @@ CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
 CALL mtr.add_suppression("Info table is not ready to be used");
 CALL mtr.add_suppression("Native table .* has the wrong structure");
-CALL mtr.add_suppression("Table \'mysql.gtid_slave_pos\' doesn\'t exist");
+CALL mtr.add_suppression("Table 'mysql\\.gtid_slave_pos' doesn't exist");
 connection node_2;
-CALL mtr.add_suppression("Unsupported protocol downgrade: incremental data collection disabled. Expect abort");
+CALL mtr.add_suppression("Unsupported protocol downgrade: incremental data collection disabled\\. Expect abort");

mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result

@@ -77,8 +77,8 @@ SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
 SET GLOBAL wsrep_provider_options = 'dbug=';
 connection node_1;
 DROP TABLE t1;
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Rejecting JOIN message from (.*): new State Transfer required\\.");
 connection node_2;
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Rejecting JOIN message from (.*): new State Transfer required\\.");
 connection node_3;
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Rejecting JOIN message from (.*): new State Transfer required\\.");

mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result

@@ -87,11 +87,11 @@ SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
 SET GLOBAL wsrep_provider_options = 'dbug=';
 connection node_1;
 DROP TABLE t1;
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Rejecting JOIN message from (.*): new State Transfer required\\.");
 connection node_2;
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Rejecting JOIN message from (.*): new State Transfer required\\.");
 connection node_3;
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Rejecting JOIN message from (.*): new State Transfer required\\.");
 disconnect node_1a;
 disconnect node_3;
 disconnect node_2;