From 744580d5a7440bcb878e434fa8012a119d79e2dc Mon Sep 17 00:00:00 2001
From: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
Date: Mon, 10 Jun 2024 04:08:42 -0600
Subject: [PATCH 1/5] MDEV-32892: IO Thread Reports False Error When Stopped
 During Connecting to Primary

The IO thread can report error code 2013 into the error log when it
is stopped during the initial connection process to the primary, as
well as when trying to read an event. However, because the IO thread
is being stopped, its connection to the primary is force-killed by
the signaling thread (see THD::awake_no_mutex()), and thereby these
connection errors should be ignored.

Reviewed By:
============
Kristian Nielsen <knielsen@knielsen-hq.org>
---
 .../suite/rpl/r/rpl_stop_slave_error.result   |  2 ++
 .../suite/rpl/t/rpl_stop_slave_error.test     | 15 +++++++++++
 sql/slave.cc                                  | 25 +++++++++++++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave_error.result b/mysql-test/suite/rpl/r/rpl_stop_slave_error.result
index 956e53cf465..71cb980b5d5 100644
--- a/mysql-test/suite/rpl/r/rpl_stop_slave_error.result
+++ b/mysql-test/suite/rpl/r/rpl_stop_slave_error.result
@@ -2,7 +2,9 @@ include/master-slave.inc
 [connection master]
 connection master;
 connection slave;
+# MDEV-32892: Repeatedly starting/stopping io_thread..
 include/stop_slave.inc
 NOT FOUND /Error reading packet from server: Lost connection/ in slave_log.err
+NOT FOUND /error code: 2013/ in slave_log.err
 include/start_slave.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave_error.test b/mysql-test/suite/rpl/t/rpl_stop_slave_error.test
index 10d7c7736f1..97542baf563 100644
--- a/mysql-test/suite/rpl/t/rpl_stop_slave_error.test
+++ b/mysql-test/suite/rpl/t/rpl_stop_slave_error.test
@@ -6,11 +6,26 @@ source include/master-slave.inc;
 
 connection master;
 sync_slave_with_master;
+
+--let $iter=100
+--echo # MDEV-32892: Repeatedly starting/stopping io_thread..
+--disable_query_log
+while ($iter)
+{
+  stop slave io_thread;
+  start slave io_thread;
+  --dec $iter
+}
+--enable_query_log
 source include/stop_slave.inc;
+
 let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/slave_log.err;
 let SEARCH_PATTERN=Error reading packet from server: Lost connection;
 source include/search_pattern_in_file.inc;
 
+let SEARCH_PATTERN=error code: 2013;
+source include/search_pattern_in_file.inc;
+
 source include/start_slave.inc;
 source include/rpl_end.inc;
 
diff --git a/sql/slave.cc b/sql/slave.cc
index 6032256c60c..f258f9f3595 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2292,6 +2292,9 @@ past_checksum:
     if (unlikely(mysql_real_query(mysql,
                                   STRING_WITH_LEN("SET skip_replication=1"))))
     {
+      if (check_io_slave_killed(mi, NULL))
+        goto slave_killed_err;
+
       err_code= mysql_errno(mysql);
       if (is_network_error(err_code))
       {
@@ -2336,6 +2339,9 @@ past_checksum:
                          STRINGIFY_ARG(MARIA_SLAVE_CAPABILITY_MINE))));
     if (unlikely(rc))
     {
+      if (check_io_slave_killed(mi, NULL))
+        goto slave_killed_err;
+
       err_code= mysql_errno(mysql);
       if (is_network_error(err_code))
       {
@@ -2377,6 +2383,9 @@ after_set_capability:
         !(master_res= mysql_store_result(mysql)) ||
         !(master_row= mysql_fetch_row(master_res)))
     {
+      if (check_io_slave_killed(mi, NULL))
+        goto slave_killed_err;
+
       err_code= mysql_errno(mysql);
       if (is_network_error(err_code))
       {
@@ -2412,6 +2421,9 @@ after_set_capability:
     rc= mysql_real_query(mysql, query_str.ptr(), query_str.length());
     if (unlikely(rc))
     {
+      if (check_io_slave_killed(mi, NULL))
+        goto slave_killed_err;
+
       err_code= mysql_errno(mysql);
       if (is_network_error(err_code))
       {
@@ -2445,6 +2457,9 @@ after_set_capability:
     rc= mysql_real_query(mysql, query_str.ptr(), query_str.length());
     if (unlikely(rc))
     {
+      if (check_io_slave_killed(mi, NULL))
+        goto slave_killed_err;
+
       err_code= mysql_errno(mysql);
       if (is_network_error(err_code))
       {
@@ -2478,6 +2493,9 @@ after_set_capability:
     rc= mysql_real_query(mysql, query_str.ptr(), query_str.length());
     if (unlikely(rc))
     {
+      if (check_io_slave_killed(mi, NULL))
+        goto slave_killed_err;
+
       err_code= mysql_errno(mysql);
       if (is_network_error(err_code))
       {
@@ -2514,6 +2532,9 @@ after_set_capability:
       rc= mysql_real_query(mysql, query_str.ptr(), query_str.length());
       if (unlikely(rc))
       {
+        if (check_io_slave_killed(mi, NULL))
+          goto slave_killed_err;
+
         err_code= mysql_errno(mysql);
         if (is_network_error(err_code))
         {
@@ -3658,7 +3679,7 @@ static ulong read_event(MYSQL* mysql, Master_info *mi, bool* suppress_warnings,
     }
     else
     {
-      if (!mi->rli.abort_slave)
+      if (!(mi->rli.abort_slave || io_slave_killed(mi)))
       {
         sql_print_error("Error reading packet from server: %s (server_errno=%d)",
                         mysql_error(mysql), mysql_errno(mysql));
@@ -7432,7 +7453,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
                              mi->port, 0, client_flag) == 0))
   {
     /* Don't repeat last error */
-    if ((int)mysql_errno(mysql) != last_errno)
+    if ((int)mysql_errno(mysql) != last_errno && !io_slave_killed(mi))
     {
       last_errno=mysql_errno(mysql);
       suppress_warnings= 0;

From b7718a1c1cf40f4b15263c27861c3f712cf8a62a Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@galeracluster.com>
Date: Wed, 6 Dec 2023 18:31:23 +0300
Subject: [PATCH 2/5] MDEV-32738: Don't roll back high-prio txn waiting on a
 lock in InnoDB

DML transactions on FK-child tables also get table locks
on FK-parent tables. If there is a DML transaction holding
such a lock, and a TOI transaction starts, the latter
BF-aborts the former and puts itself into a waiting state.
If at this moment another DML transaction on FK-child table
starts, it doesn't check that the transaction waiting on
a parent table lock is TOI, and it erroneously BF-aborts
the waiting TOI transaction.

The fix: don't roll back high-priority transaction waiting
on a lock in InnoDB, instead roll back an incoming DML
transaction.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
---
 mysql-test/suite/galera/r/MDEV-32738.result | 32 +++++++++
 mysql-test/suite/galera/t/MDEV-32738.cnf    |  5 ++
 mysql-test/suite/galera/t/MDEV-32738.test   | 74 +++++++++++++++++++++
 storage/innobase/lock/lock0lock.cc          | 17 ++++-
 4 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-32738.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-32738.cnf
 create mode 100644 mysql-test/suite/galera/t/MDEV-32738.test

diff --git a/mysql-test/suite/galera/r/MDEV-32738.result b/mysql-test/suite/galera/r/MDEV-32738.result
new file mode 100644
index 00000000000..90bd7d49023
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-32738.result
@@ -0,0 +1,32 @@
+connection node_2;
+connection node_1;
+connect con1_1,127.0.0.1,root,,test,$NODE_MYPORT_1;
+connect con1_2,127.0.0.1,root,,test,$NODE_MYPORT_1;
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t1_fk(c1 INT PRIMARY KEY, c2 INT, INDEX (c2), FOREIGN KEY (c2) REFERENCES t1(c1)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+connection con1_1;
+SET DEBUG_SYNC = 'ib_after_row_insert WAIT_FOR bf_abort';
+INSERT INTO t1_fk VALUES (1, 1);
+connection con1_2;
+SET DEBUG_SYNC = 'ha_write_row_start SIGNAL may_alter WAIT_FOR may_insert';
+INSERT INTO t1_fk VALUES (2, 2);
+connection node_1;
+SET DEBUG_SYNC = 'now WAIT_FOR may_alter';
+SET DEBUG_SYNC = 'after_lock_table_for_trx SIGNAL may_insert WAIT_FOR alter_continue';
+ALTER TABLE t1 ADD COLUMN c2 INT;
+connection con1_1;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection con1_2;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+SET DEBUG_SYNC = 'now SIGNAL alter_continue';
+connection node_1;
+connection node_2;
+INSERT INTO t1 (c1, c2) VALUES (2, 2);
+connection node_1;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1_fk, t1;
+disconnect con1_1;
+disconnect con1_2;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/t/MDEV-32738.cnf b/mysql-test/suite/galera/t/MDEV-32738.cnf
new file mode 100644
index 00000000000..5e02ce5aa19
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-32738.cnf
@@ -0,0 +1,5 @@
+!include ../galera_2nodes.cnf
+
+# Disable retry for autocommit statements.
+[mysqld]
+wsrep-retry-autocommit=0
diff --git a/mysql-test/suite/galera/t/MDEV-32738.test b/mysql-test/suite/galera/t/MDEV-32738.test
new file mode 100644
index 00000000000..fc698af6cfc
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-32738.test
@@ -0,0 +1,74 @@
+#
+# MDEV-32738: Don't roll back high-priority transaction waiting on a lock in InnoDB.
+#
+# DML transactions on FK-child tables also get table locks on FK-parent tables.
+# If there is a DML transaction holding such a lock, and a TOI transaction starts,
+# the latter BF-aborts the former and puts itself into a waiting state.
+# If at this moment another DML transaction on FK-child table starts, it doesn't
+# check that the transaction waiting on a parent table lock is TOI, and it
+# erroneously BF-aborts the waiting TOI transaction.
+#
+# The fix: check that the waiting transaction is TOI and in this case roll back
+# the incoming DML transaction in InnoDB.
+#
+# The test runs with autocommit statement retry disabled.
+#
+
+--source include/galera_cluster.inc
+--source include/have_debug_sync.inc
+--source include/have_debug.inc
+
+--connect con1_1,127.0.0.1,root,,test,$NODE_MYPORT_1
+--connect con1_2,127.0.0.1,root,,test,$NODE_MYPORT_1
+
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t1_fk(c1 INT PRIMARY KEY, c2 INT, INDEX (c2), FOREIGN KEY (c2) REFERENCES t1(c1)) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (1);
+
+--connection con1_1
+SET DEBUG_SYNC = 'ib_after_row_insert WAIT_FOR bf_abort';
+# INSERT also grabs FK-referenced table lock.
+--send
+  INSERT INTO t1_fk VALUES (1, 1);
+
+--connection con1_2
+SET DEBUG_SYNC = 'ha_write_row_start SIGNAL may_alter WAIT_FOR may_insert';
+# Stop before doing anything, but pass wsrep_sync_wait().
+# This should be done before ALTER enters TOI.
+--send
+  INSERT INTO t1_fk VALUES (2, 2);
+
+--connection node_1
+SET DEBUG_SYNC = 'now WAIT_FOR may_alter';
+SET DEBUG_SYNC = 'after_lock_table_for_trx SIGNAL may_insert WAIT_FOR alter_continue';
+# ALTER BF-aborts the first INSERT and lets the second INSERT continue.
+--send
+  ALTER TABLE t1 ADD COLUMN c2 INT;
+
+--connection con1_1
+# First INSERT gets BF-aborted.
+--error ER_LOCK_DEADLOCK
+--reap
+
+--connection con1_2
+# Second INSERT rolls back as ALTER is waiting on the lock.
+--error ER_LOCK_DEADLOCK
+--reap
+SET DEBUG_SYNC = 'now SIGNAL alter_continue';
+
+--connection node_1
+# ALTER succeeds.
+--reap
+
+--connection node_2
+# Sanity check that ALTER has been replicated.
+INSERT INTO t1 (c1, c2) VALUES (2, 2);
+
+# Cleanup.
+--connection node_1
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1_fk, t1;
+--disconnect con1_1
+--disconnect con1_2
+--source include/galera_end.inc
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index 05a3260f705..d0b4105d9c6 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -3738,6 +3738,19 @@ lock_table_enqueue_waiting(
 	}
 
 #ifdef WITH_WSREP
+	/*
+	  Check if a BF-transaction holds the conflicting lock.
+	  In this case, roll back current transaction.
+	*/
+	if (trx->is_wsrep() && c_lock->trx->is_wsrep() &&
+	    wsrep_thd_is_BF(c_lock->trx->mysql_thd, FALSE)) {
+		if (wsrep_thd_is_BF(trx->mysql_thd, FALSE)) {
+			/* BF-BF wait is a bug. */
+			ut_error;
+		}
+		trx->lock.was_chosen_as_deadlock_victim = TRUE;
+	}
+
 	if (trx->is_wsrep() && trx->lock.was_chosen_as_deadlock_victim) {
 		return(DB_DEADLOCK);
 	}
@@ -3811,7 +3824,8 @@ lock_table_other_has_incompatible(
 		    && (wait || !lock_get_wait(lock))) {
 
 #ifdef WITH_WSREP
-			if (lock->trx->is_wsrep()) {
+			if (lock->trx->is_wsrep() &&
+			    !wsrep_thd_is_BF(lock->trx->mysql_thd, FALSE)) {
 				if (UNIV_UNLIKELY(wsrep_debug)) {
 					ib::info() << "WSREP: table lock abort for table:"
 						   << table->name;
@@ -3921,6 +3935,7 @@ lock_table(
 
 	trx_mutex_exit(trx);
 
+	DEBUG_SYNC_C("after_lock_table_for_trx");
 	return(err);
 }
 

From 8d61a94b8b1cfc18e1a07f8a29dcaef1dfe9d73b Mon Sep 17 00:00:00 2001
From: sjaakola <seppo.jaakola@iki.fi>
Date: Thu, 27 Jun 2024 15:10:25 +0300
Subject: [PATCH 3/5] MDEV-34477 galera.galera_gcache_recover_manytrx sporadic
 failures

The problem was in error message suppression, which did not match
the actual warning messages, due to bad quotations.
Changed warnings message suppressions to more simple format.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
---
 .../suite/galera/r/galera_gcache_recover_manytrx.result      | 5 ++---
 mysql-test/suite/galera/t/galera_gcache_recover_manytrx.test | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result b/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result
index c853d5b79f6..8c6da8f8f46 100644
--- a/mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result
+++ b/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");
diff --git a/mysql-test/suite/galera/t/galera_gcache_recover_manytrx.test b/mysql-test/suite/galera/t/galera_gcache_recover_manytrx.test
index e3921264f3d..532de6d5d10 100644
--- a/mysql-test/suite/galera/t/galera_gcache_recover_manytrx.test
+++ b/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");

From f942927141e74b4e5fb168a530a772e96fad9f3e Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Wed, 3 Jul 2024 19:04:24 +0200
Subject: [PATCH 4/5] MDEV-21538: galera_desync_overlapped test result content
 mismatch

The test has been made more stable according to
the recommendations of the Codership team.
---
 mysql-test/suite/galera/disabled.def                      | 1 -
 mysql-test/suite/galera/r/galera_desync_overlapped.result | 3 ++-
 mysql-test/suite/galera/t/galera_desync_overlapped.test   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 45c04bdfd4b..4f3f9884997 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -18,4 +18,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
diff --git a/mysql-test/suite/galera/r/galera_desync_overlapped.result b/mysql-test/suite/galera/r/galera_desync_overlapped.result
index e3f40d444ee..f7aa7a1c5df 100644
--- a/mysql-test/suite/galera/r/galera_desync_overlapped.result
+++ b/mysql-test/suite/galera/r/galera_desync_overlapped.result
@@ -1,7 +1,7 @@
 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.
diff --git a/mysql-test/suite/galera/t/galera_desync_overlapped.test b/mysql-test/suite/galera/t/galera_desync_overlapped.test
index 8b78e8cdeb7..659e4a2e1e2 100644
--- a/mysql-test/suite/galera/t/galera_desync_overlapped.test
+++ b/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';

From d0a2d4e755210523ce2e7186adecae2632c55835 Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Thu, 4 Jul 2024 02:43:32 +0200
Subject: [PATCH 5/5] galera mtr tests: correction of inaccuracies in warnings
 suppressions

---
 .../suite/galera/include/galera_sst_restore.inc  |  2 +-
 .../galera/include/galera_sst_set_mysqldump.inc  |  4 ++--
 mysql-test/suite/galera/r/GAL-401.result         |  2 +-
 mysql-test/suite/galera/r/GAL-419.result         |  9 +++++----
 mysql-test/suite/galera/r/GCF-939.result         |  4 ++--
 mysql-test/suite/galera/r/MDEV-21479.result      |  2 +-
 mysql-test/suite/galera/r/MDEV-26575.result      |  2 +-
 mysql-test/suite/galera/r/MDEV-29142.result      | 12 ++++++------
 mysql-test/suite/galera/r/MW-284.result          |  2 +-
 mysql-test/suite/galera/r/MW-329.result          |  3 +--
 mysql-test/suite/galera/r/galera#500.result      |  2 +-
 .../suite/galera/r/galera-features#117.result    |  2 +-
 .../galera/r/galera_bf_abort_shutdown.result     |  2 +-
 .../galera/r/galera_desync_overlapped.result     |  1 +
 .../suite/galera/r/galera_drop_database.result   |  2 +-
 .../suite/galera/r/galera_drop_multi.result      |  2 +-
 mysql-test/suite/galera/r/galera_events2.result  |  2 +-
 .../r/galera_forced_binlog_format_ctas.result    |  2 +-
 mysql-test/suite/galera/r/galera_gra_log.result  |  2 +-
 .../suite/galera/r/galera_gtid_server_id.result  |  2 +-
 .../suite/galera/r/galera_ist_mysqldump.result   |  8 ++++----
 mysql-test/suite/galera/r/galera_kill_ddl.result |  2 +-
 .../suite/galera/r/galera_partition.result       |  2 +-
 .../r/galera_query_cache_invalidate.result       |  4 ++--
 .../suite/galera/r/galera_replica_no_gtid.result |  2 +-
 .../r/galera_restart_on_unknown_option.result    |  2 +-
 .../suite/galera/r/galera_ssl_compression.result |  2 +-
 .../suite/galera/r/galera_ssl_upgrade.result     |  8 ++------
 .../suite/galera/r/galera_sst_mysqldump.result   |  6 +++---
 .../r/galera_sst_mysqldump_with_key.result       |  6 +++---
 .../suite/galera/r/galera_toi_ddl_error.result   |  4 ++--
 .../r/galera_var_ignore_apply_errors.result      | 12 ++++++------
 .../galera/r/galera_var_slave_threads.result     |  2 +-
 .../r/galera_var_wsrep_start_position.result     |  2 +-
 .../suite/galera/r/galera_vote_rejoin_ddl.result |  4 ++--
 mysql-test/suite/galera/r/galera_wan.result      |  6 +++---
 .../galera_wsrep_provider_options_syntax.result  |  2 +-
 mysql-test/suite/galera/r/mdev-28433.result      |  2 +-
 mysql-test/suite/galera/r/mdev-31651.result      |  4 ++--
 mysql-test/suite/galera/r/mysql-wsrep#33.result  |  6 +++---
 .../suite/galera/r/versioning_trx_id.result      |  2 +-
 mysql-test/suite/galera/t/GAL-401.test           |  2 +-
 mysql-test/suite/galera/t/GAL-419.test           |  9 +++++----
 mysql-test/suite/galera/t/GCF-939.test           |  5 ++---
 mysql-test/suite/galera/t/MDEV-21479.test        |  2 +-
 mysql-test/suite/galera/t/MDEV-26575.test        |  2 +-
 mysql-test/suite/galera/t/MDEV-29142.test        | 12 ++++++------
 mysql-test/suite/galera/t/MW-284.test            |  2 +-
 mysql-test/suite/galera/t/MW-329.test            |  6 ++----
 mysql-test/suite/galera/t/MW-369.test            |  1 -
 .../suite/galera/t/enforce_storage_engine2.cnf   |  4 ----
 mysql-test/suite/galera/t/galera#414.cnf         |  1 -
 mysql-test/suite/galera/t/galera#500.test        |  2 +-
 .../suite/galera/t/galera-features#117.test      |  2 +-
 .../suite/galera/t/galera_bf_abort_shutdown.test |  2 +-
 mysql-test/suite/galera/t/galera_defaults.test   |  2 +-
 .../suite/galera/t/galera_desync_overlapped.test |  4 +---
 .../suite/galera/t/galera_drop_database.test     |  2 +-
 mysql-test/suite/galera/t/galera_drop_multi.test |  2 +-
 mysql-test/suite/galera/t/galera_events2.test    |  2 +-
 .../suite/galera/t/galera_fk_truncate.test       |  1 +
 .../t/galera_forced_binlog_format_ctas.test      |  2 +-
 mysql-test/suite/galera/t/galera_gra_log.test    |  2 +-
 .../suite/galera/t/galera_gtid_server_id.test    |  2 +-
 .../suite/galera/t/galera_ist_mysqldump.test     |  2 +-
 .../galera/t/galera_ist_restart_joiner.test      |  1 -
 mysql-test/suite/galera/t/galera_kill_ddl.test   |  2 +-
 mysql-test/suite/galera/t/galera_partition.test  |  5 +----
 .../galera/t/galera_query_cache_invalidate.test  |  4 ++--
 .../suite/galera/t/galera_replica_no_gtid.test   |  2 +-
 .../t/galera_restart_on_unknown_option.test      |  2 +-
 .../suite/galera/t/galera_ssl_compression.test   |  2 +-
 .../suite/galera/t/galera_ssl_upgrade.test       | 10 ++--------
 .../suite/galera/t/galera_toi_ddl_error.test     |  4 ++--
 .../galera/t/galera_var_ignore_apply_errors.test | 13 ++++++-------
 .../suite/galera/t/galera_var_slave_threads.test |  2 +-
 .../t/galera_var_wsrep_start_position.test       |  2 +-
 .../suite/galera/t/galera_vote_rejoin_ddl.test   |  4 ++--
 mysql-test/suite/galera/t/galera_wan.test        |  8 +++-----
 .../t/galera_wsrep_provider_options_syntax.test  |  2 +-
 mysql-test/suite/galera/t/mdev-28433.test        |  2 +-
 mysql-test/suite/galera/t/mdev-31651.test        |  5 ++---
 mysql-test/suite/galera/t/versioning_trx_id.test |  2 +-
 mysql-test/suite/galera_3nodes/disabled.def      |  1 -
 .../galera_3nodes/include/galera_resume.inc      |  1 -
 mysql-test/suite/galera_3nodes/r/GCF-354.result  |  8 ++++----
 mysql-test/suite/galera_3nodes/r/GCF-363.result  |  6 +++---
 mysql-test/suite/galera_3nodes/r/GCF-376.result  |  2 +-
 .../suite/galera_3nodes/r/MDEV-29171.result      |  4 ++--
 .../galera_3nodes/r/galera-features#119.result   |  6 +++---
 .../r/galera_evs_suspect_timeout.result          |  2 +-
 .../suite/galera_3nodes/r/galera_garbd.result    |  6 +++---
 .../galera_3nodes/r/galera_garbd_backup.result   |  6 +++---
 .../r/galera_gtid_consistency.result             | 13 +++++++------
 .../galera_3nodes/r/galera_ipv6_mysqldump.result |  8 ++++----
 .../galera_3nodes/r/galera_join_with_cc_A.result |  6 +++---
 .../galera_3nodes/r/galera_join_with_cc_B.result |  6 +++---
 .../galera_3nodes/r/galera_join_with_cc_C.result |  8 ++++----
 .../galera_3nodes/r/galera_pc_bootstrap.result   |  2 +-
 .../r/galera_safe_to_bootstrap.result            | 16 ++++++++--------
 .../suite/galera_3nodes/r/galera_toi_vote.result |  2 +-
 .../r/galera_vote_rejoin_mysqldump.result        |  6 +++---
 .../r/inconsistency_shutdown.result              | 10 +++++-----
 mysql-test/suite/galera_3nodes/t/GCF-354.test    |  8 ++++----
 mysql-test/suite/galera_3nodes/t/GCF-363.test    |  6 +++---
 mysql-test/suite/galera_3nodes/t/GCF-376.test    |  2 +-
 mysql-test/suite/galera_3nodes/t/MDEV-29171.test |  4 ++--
 .../galera_3nodes/t/galera-features#119.test     |  7 +++----
 .../t/galera_evs_suspect_timeout.test            |  2 +-
 .../suite/galera_3nodes/t/galera_garbd.test      |  6 +++---
 .../galera_3nodes/t/galera_garbd_backup.test     |  6 +++---
 .../galera_3nodes/t/galera_gtid_consistency.test | 13 +++++++------
 .../galera_3nodes/t/galera_ipv6_mysqldump.test   |  7 ++++---
 .../galera_3nodes/t/galera_join_with_cc_A.test   |  6 +++---
 .../galera_3nodes/t/galera_join_with_cc_B.test   |  6 +++---
 .../galera_3nodes/t/galera_join_with_cc_C.test   |  8 ++++----
 .../galera_3nodes/t/galera_pc_bootstrap.test     |  2 +-
 .../t/galera_safe_to_bootstrap.test              | 16 ++++++++--------
 .../suite/galera_3nodes/t/galera_toi_vote.test   |  2 +-
 .../galera_3nodes/t/galera_var_node_address.cnf  |  1 -
 .../galera_3nodes/t/inconsistency_shutdown.test  | 10 +++++-----
 mysql-test/suite/galera_3nodes_sr/t/GCF-336.test |  1 -
 mysql-test/suite/galera_sr/r/MDEV-30838.result   |  2 +-
 .../suite/galera_sr/r/galera_sr_cc_master.result |  2 +-
 .../galera_sr/r/galera_sr_mysqldump_sst.result   |  6 +++---
 .../galera_sr/r/galera_sr_shutdown_slave.result  |  2 +-
 .../suite/galera_sr/r/galera_sr_ws_size.result   |  8 ++++----
 .../suite/galera_sr/r/galera_sr_ws_size2.result  | 16 ++++++++--------
 mysql-test/suite/galera_sr/r/mdev_18631.result   |  2 +-
 mysql-test/suite/galera_sr/t/GCF-1008.test       |  1 -
 mysql-test/suite/galera_sr/t/GCF-1051.test       |  1 -
 mysql-test/suite/galera_sr/t/GCF-845.test        |  1 -
 mysql-test/suite/galera_sr/t/GCF-851.test        |  1 -
 mysql-test/suite/galera_sr/t/GCF-889.test        |  1 -
 mysql-test/suite/galera_sr/t/MDEV-21613.test     |  2 --
 mysql-test/suite/galera_sr/t/MDEV-30838.test     |  2 +-
 .../suite/galera_sr/t/galera_sr_cc_master.test   |  2 +-
 .../galera_sr/t/galera_sr_shutdown_slave.test    |  2 +-
 .../suite/galera_sr/t/galera_sr_ws_size.test     |  8 ++++----
 .../suite/galera_sr/t/galera_sr_ws_size2.test    | 16 ++++++++--------
 .../t/galera_var_ignore_apply_errors_sr.test     |  2 +-
 mysql-test/suite/galera_sr/t/mdev_18631.test     |  3 +--
 .../suite/galera_sr/t/mysql-wsrep-bugs-900.test  |  2 +-
 143 files changed, 286 insertions(+), 322 deletions(-)

diff --git a/mysql-test/suite/galera/include/galera_sst_restore.inc b/mysql-test/suite/galera/include/galera_sst_restore.inc
index 83d07f086d1..ab24ca00ed8 100644
--- a/mysql-test/suite/galera/include/galera_sst_restore.inc
+++ b/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';
diff --git a/mysql-test/suite/galera/include/galera_sst_set_mysqldump.inc b/mysql-test/suite/galera/include/galera_sst_set_mysqldump.inc
index 16af5742b9b..70f086934df 100644
--- a/mysql-test/suite/galera/include/galera_sst_set_mysqldump.inc
+++ b/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
diff --git a/mysql-test/suite/galera/r/GAL-401.result b/mysql-test/suite/galera/r/GAL-401.result
index 859a4415f8d..9522dc80bad 100644
--- a/mysql-test/suite/galera/r/GAL-401.result
+++ b/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';
diff --git a/mysql-test/suite/galera/r/GAL-419.result b/mysql-test/suite/galera/r/GAL-419.result
index c70c9ee3263..e6bde169c23 100644
--- a/mysql-test/suite/galera/r/GAL-419.result
+++ b/mysql-test/suite/galera/r/GAL-419.result
@@ -1,10 +1,11 @@
 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 ...
diff --git a/mysql-test/suite/galera/r/GCF-939.result b/mysql-test/suite/galera/r/GCF-939.result
index 24d4eab67e5..f9b65bced42 100644
--- a/mysql-test/suite/galera/r/GCF-939.result
+++ b/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");
diff --git a/mysql-test/suite/galera/r/MDEV-21479.result b/mysql-test/suite/galera/r/MDEV-21479.result
index 7d1220a038b..de00413bdcc 100644
--- a/mysql-test/suite/galera/r/MDEV-21479.result
+++ b/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';
diff --git a/mysql-test/suite/galera/r/MDEV-26575.result b/mysql-test/suite/galera/r/MDEV-26575.result
index 5b447e1ae20..0856c836f7e 100644
--- a/mysql-test/suite/galera/r/MDEV-26575.result
+++ b/mysql-test/suite/galera/r/MDEV-26575.result
@@ -1,7 +1,7 @@
 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;
diff --git a/mysql-test/suite/galera/r/MDEV-29142.result b/mysql-test/suite/galera/r/MDEV-29142.result
index 2528520e236..370cbf5b074 100644
--- a/mysql-test/suite/galera/r/MDEV-29142.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/MW-284.result b/mysql-test/suite/galera/r/MW-284.result
index 6ca1f16db6b..ba8b67e9c31 100644
--- a/mysql-test/suite/galera/r/MW-284.result
+++ b/mysql-test/suite/galera/r/MW-284.result
@@ -1,7 +1,7 @@
 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;
diff --git a/mysql-test/suite/galera/r/MW-329.result b/mysql-test/suite/galera/r/MW-329.result
index 54d55eea7ca..16afcc15996 100644
--- a/mysql-test/suite/galera/r/MW-329.result
+++ b/mysql-test/suite/galera/r/MW-329.result
@@ -1,6 +1,5 @@
 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;
diff --git a/mysql-test/suite/galera/r/galera#500.result b/mysql-test/suite/galera/r/galera#500.result
index a5ab0b19718..a142e966e94 100644
--- a/mysql-test/suite/galera/r/galera#500.result
+++ b/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\\.");
diff --git a/mysql-test/suite/galera/r/galera-features#117.result b/mysql-test/suite/galera/r/galera-features#117.result
index 21d810ca165..900e4fe2aac 100644
--- a/mysql-test/suite/galera/r/galera-features#117.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result b/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result
index 5233ea6c63c..1015e7b652d 100644
--- a/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/galera_desync_overlapped.result b/mysql-test/suite/galera/r/galera_desync_overlapped.result
index f7aa7a1c5df..69ae5e2766d 100644
--- a/mysql-test/suite/galera/r/galera_desync_overlapped.result
+++ b/mysql-test/suite/galera/r/galera_desync_overlapped.result
@@ -36,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
diff --git a/mysql-test/suite/galera/r/galera_drop_database.result b/mysql-test/suite/galera/r/galera_drop_database.result
index 03b55136c6f..ed94678c08e 100644
--- a/mysql-test/suite/galera/r/galera_drop_database.result
+++ b/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'
diff --git a/mysql-test/suite/galera/r/galera_drop_multi.result b/mysql-test/suite/galera/r/galera_drop_multi.result
index 1ff8afe3219..7934d6e0f15 100644
--- a/mysql-test/suite/galera/r/galera_drop_multi.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/galera_events2.result b/mysql-test/suite/galera/r/galera_events2.result
index 26d3a74a7f3..5cbee44f186 100644
--- a/mysql-test/suite/galera/r/galera_events2.result
+++ b/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
diff --git a/mysql-test/suite/galera/r/galera_forced_binlog_format_ctas.result b/mysql-test/suite/galera/r/galera_forced_binlog_format_ctas.result
index cae5f723c51..a8a51b278bd 100644
--- a/mysql-test/suite/galera/r/galera_forced_binlog_format_ctas.result
+++ b/mysql-test/suite/galera/r/galera_forced_binlog_format_ctas.result
@@ -1,6 +1,6 @@
 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;
diff --git a/mysql-test/suite/galera/r/galera_gra_log.result b/mysql-test/suite/galera/r/galera_gra_log.result
index 8c0286a4ef1..128509a220f 100644
--- a/mysql-test/suite/galera/r/galera_gra_log.result
+++ b/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 ");
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 8765fcc1636..5acf4519d0c 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_ist_mysqldump.result b/mysql-test/suite/galera/r/galera_ist_mysqldump.result
index 6c57a571b85..8737819e552 100644
--- a/mysql-test/suite/galera/r/galera_ist_mysqldump.result
+++ b/mysql-test/suite/galera/r/galera_ist_mysqldump.result
@@ -1,15 +1,15 @@
 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");
diff --git a/mysql-test/suite/galera/r/galera_kill_ddl.result b/mysql-test/suite/galera/r/galera_kill_ddl.result
index 33a1b19095f..34d2cc0be76 100644
--- a/mysql-test/suite/galera/r/galera_kill_ddl.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/galera_partition.result b/mysql-test/suite/galera/r/galera_partition.result
index 7b4d6e41054..ca335984ab4 100644
--- a/mysql-test/suite/galera/r/galera_partition.result
+++ b/mysql-test/suite/galera/r/galera_partition.result
@@ -1,7 +1,7 @@
 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(
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 98438b3b527..425b512bc03 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_replica_no_gtid.result b/mysql-test/suite/galera/r/galera_replica_no_gtid.result
index 80d713c2348..f4b1a344400 100644
--- a/mysql-test/suite/galera/r/galera_replica_no_gtid.result
+++ b/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
diff --git a/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result b/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
index b1ee6f5955f..221ccc76afd 100644
--- a/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
+++ b/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
diff --git a/mysql-test/suite/galera/r/galera_ssl_compression.result b/mysql-test/suite/galera/r/galera_ssl_compression.result
index 0acc4b97eea..545f4babfe1 100644
--- a/mysql-test/suite/galera/r/galera_ssl_compression.result
+++ b/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");
diff --git a/mysql-test/suite/galera/r/galera_ssl_upgrade.result b/mysql-test/suite/galera/r/galera_ssl_upgrade.result
index 9993b86e0e9..9030850b67e 100644
--- a/mysql-test/suite/galera/r/galera_ssl_upgrade.result
+++ b/mysql-test/suite/galera/r/galera_ssl_upgrade.result
@@ -1,10 +1,6 @@
 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\\(\\)");
diff --git a/mysql-test/suite/galera/r/galera_sst_mysqldump.result b/mysql-test/suite/galera/r/galera_sst_mysqldump.result
index e63b6f6f98d..e76d72383c1 100644
--- a/mysql-test/suite/galera/r/galera_sst_mysqldump.result
+++ b/mysql-test/suite/galera/r/galera_sst_mysqldump.result
@@ -1,8 +1,8 @@
 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");
diff --git a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result
index fcb250f02ce..fe574abf93f 100644
--- a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result
+++ b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result
@@ -1,8 +1,8 @@
 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;
diff --git a/mysql-test/suite/galera/r/galera_toi_ddl_error.result b/mysql-test/suite/galera/r/galera_toi_ddl_error.result
index 9aec137d010..d9e66dc537b 100644
--- a/mysql-test/suite/galera/r/galera_toi_ddl_error.result
+++ b/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\\.");
diff --git a/mysql-test/suite/galera/r/galera_var_ignore_apply_errors.result b/mysql-test/suite/galera/r/galera_var_ignore_apply_errors.result
index 082d2e8eb1d..0b32f43704f 100644
--- a/mysql-test/suite/galera/r/galera_var_ignore_apply_errors.result
+++ b/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\\.");
diff --git a/mysql-test/suite/galera/r/galera_var_slave_threads.result b/mysql-test/suite/galera/r/galera_var_slave_threads.result
index 36dc79bdf82..936f58b89a0 100644
--- a/mysql-test/suite/galera/r/galera_var_slave_threads.result
+++ b/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'
diff --git a/mysql-test/suite/galera/r/galera_var_wsrep_start_position.result b/mysql-test/suite/galera/r/galera_var_wsrep_start_position.result
index 3d409f90eac..fe0bdaa404f 100644
--- a/mysql-test/suite/galera/r/galera_var_wsrep_start_position.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result b/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result
index ff0063fbf7b..fa0d7d83c80 100644
--- a/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/galera_wan.result b/mysql-test/suite/galera/r/galera_wan.result
index bc4113ffb1c..0021b509bf2 100644
--- a/mysql-test/suite/galera/r/galera_wan.result
+++ b/mysql-test/suite/galera/r/galera_wan.result
@@ -1,9 +1,9 @@
 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
diff --git a/mysql-test/suite/galera/r/galera_wsrep_provider_options_syntax.result b/mysql-test/suite/galera/r/galera_wsrep_provider_options_syntax.result
index 0f7cd134156..5b35bdcef10 100644
--- a/mysql-test/suite/galera/r/galera_wsrep_provider_options_syntax.result
+++ b/mysql-test/suite/galera/r/galera_wsrep_provider_options_syntax.result
@@ -1,6 +1,6 @@
 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
diff --git a/mysql-test/suite/galera/r/mdev-28433.result b/mysql-test/suite/galera/r/mdev-28433.result
index c2dde6481f4..dc5fdd5be49 100644
--- a/mysql-test/suite/galera/r/mdev-28433.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/mdev-31651.result b/mysql-test/suite/galera/r/mdev-31651.result
index f715aa895f8..15c56a71344 100644
--- a/mysql-test/suite/galera/r/mdev-31651.result
+++ b/mysql-test/suite/galera/r/mdev-31651.result
@@ -1,7 +1,7 @@
 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=';
diff --git a/mysql-test/suite/galera/r/mysql-wsrep#33.result b/mysql-test/suite/galera/r/mysql-wsrep#33.result
index 2c116347fca..ef4240869a8 100644
--- a/mysql-test/suite/galera/r/mysql-wsrep#33.result
+++ b/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;
diff --git a/mysql-test/suite/galera/r/versioning_trx_id.result b/mysql-test/suite/galera/r/versioning_trx_id.result
index c28662dcfe6..099be737e65 100644
--- a/mysql-test/suite/galera/r/versioning_trx_id.result
+++ b/mysql-test/suite/galera/r/versioning_trx_id.result
@@ -1,6 +1,6 @@
 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;
diff --git a/mysql-test/suite/galera/t/GAL-401.test b/mysql-test/suite/galera/t/GAL-401.test
index 06ce37dc81f..243fde23642 100644
--- a/mysql-test/suite/galera/t/GAL-401.test
+++ b/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';
diff --git a/mysql-test/suite/galera/t/GAL-419.test b/mysql-test/suite/galera/t/GAL-419.test
index 60c34f209eb..699a8e54361 100644
--- a/mysql-test/suite/galera/t/GAL-419.test
+++ b/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;
diff --git a/mysql-test/suite/galera/t/GCF-939.test b/mysql-test/suite/galera/t/GCF-939.test
index 637d656996e..62bcdb818c7 100644
--- a/mysql-test/suite/galera/t/GCF-939.test
+++ b/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");
diff --git a/mysql-test/suite/galera/t/MDEV-21479.test b/mysql-test/suite/galera/t/MDEV-21479.test
index 86de97ea77c..17451b3bb77 100644
--- a/mysql-test/suite/galera/t/MDEV-21479.test
+++ b/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
diff --git a/mysql-test/suite/galera/t/MDEV-26575.test b/mysql-test/suite/galera/t/MDEV-26575.test
index 4554f632c6f..acb5ee2494f 100644
--- a/mysql-test/suite/galera/t/MDEV-26575.test
+++ b/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.
diff --git a/mysql-test/suite/galera/t/MDEV-29142.test b/mysql-test/suite/galera/t/MDEV-29142.test
index f7a8b329089..2dc48a74a9d 100644
--- a/mysql-test/suite/galera/t/MDEV-29142.test
+++ b/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");
 
diff --git a/mysql-test/suite/galera/t/MW-284.test b/mysql-test/suite/galera/t/MW-284.test
index d7da1dcd214..bc630912d57 100644
--- a/mysql-test/suite/galera/t/MW-284.test
+++ b/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
diff --git a/mysql-test/suite/galera/t/MW-329.test b/mysql-test/suite/galera/t/MW-329.test
index 904fc2f95d8..38f2007f6b6 100644
--- a/mysql-test/suite/galera/t/MW-329.test
+++ b/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;
\ No newline at end of file
+set global innodb_status_output=Default;
diff --git a/mysql-test/suite/galera/t/MW-369.test b/mysql-test/suite/galera/t/MW-369.test
index 0efac20dbe0..157993a3eb4 100644
--- a/mysql-test/suite/galera/t/MW-369.test
+++ b/mysql-test/suite/galera/t/MW-369.test
@@ -340,4 +340,3 @@ SELECT * FROM cg;
 
 DROP TABLE cg;
 DROP TABLE pg;
-
diff --git a/mysql-test/suite/galera/t/enforce_storage_engine2.cnf b/mysql-test/suite/galera/t/enforce_storage_engine2.cnf
index b14fce85b36..590c4afd4d9 100644
--- a/mysql-test/suite/galera/t/enforce_storage_engine2.cnf
+++ b/mysql-test/suite/galera/t/enforce_storage_engine2.cnf
@@ -7,7 +7,3 @@ sql_mode=''
 [mysqld.2]
 enforce_storage_engine=innodb
 sql_mode=''
-
-
-
-
diff --git a/mysql-test/suite/galera/t/galera#414.cnf b/mysql-test/suite/galera/t/galera#414.cnf
index fbd1c58754f..03e7214b76f 100644
--- a/mysql-test/suite/galera/t/galera#414.cnf
+++ b/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'
-
diff --git a/mysql-test/suite/galera/t/galera#500.test b/mysql-test/suite/galera/t/galera#500.test
index 471620b32c1..c393b7fd056 100644
--- a/mysql-test/suite/galera/t/galera#500.test
+++ b/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
diff --git a/mysql-test/suite/galera/t/galera-features#117.test b/mysql-test/suite/galera/t/galera-features#117.test
index 30301996d1c..9a3eaf8686e 100644
--- a/mysql-test/suite/galera/t/galera-features#117.test
+++ b/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");
 
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test b/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test
index 6eb1cd9f4b2..a9109ac42d8 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test
+++ b/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)
 
diff --git a/mysql-test/suite/galera/t/galera_defaults.test b/mysql-test/suite/galera/t/galera_defaults.test
index 28e6f0cce38..74022a40b3a 100644
--- a/mysql-test/suite/galera/t/galera_defaults.test
+++ b/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.6
+--let $galera_version=26.4.8
 source ../wsrep/include/check_galera_version.inc;
 
 # Global Variables
diff --git a/mysql-test/suite/galera/t/galera_desync_overlapped.test b/mysql-test/suite/galera/t/galera_desync_overlapped.test
index 659e4a2e1e2..2d94011690b 100644
--- a/mysql-test/suite/galera/t/galera_desync_overlapped.test
+++ b/mysql-test/suite/galera/t/galera_desync_overlapped.test
@@ -46,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;
 
diff --git a/mysql-test/suite/galera/t/galera_drop_database.test b/mysql-test/suite/galera/t/galera_drop_database.test
index c1a66e1f66c..7bffe94287d 100644
--- a/mysql-test/suite/galera/t/galera_drop_database.test
+++ b/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';
diff --git a/mysql-test/suite/galera/t/galera_drop_multi.test b/mysql-test/suite/galera/t/galera_drop_multi.test
index 44b1b619b2b..920c089185e 100644
--- a/mysql-test/suite/galera/t/galera_drop_multi.test
+++ b/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;
diff --git a/mysql-test/suite/galera/t/galera_events2.test b/mysql-test/suite/galera/t/galera_events2.test
index b29ad3ba2f2..6f200257e16 100644
--- a/mysql-test/suite/galera/t/galera_events2.test
+++ b/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;
diff --git a/mysql-test/suite/galera/t/galera_fk_truncate.test b/mysql-test/suite/galera/t/galera_fk_truncate.test
index 9d54a720432..61b0f562065 100644
--- a/mysql-test/suite/galera/t/galera_fk_truncate.test
+++ b/mysql-test/suite/galera/t/galera_fk_truncate.test
@@ -1,4 +1,5 @@
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 CREATE TABLE author (
   id SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
diff --git a/mysql-test/suite/galera/t/galera_forced_binlog_format_ctas.test b/mysql-test/suite/galera/t/galera_forced_binlog_format_ctas.test
index bb9cb6a9403..6260acaba2f 100644
--- a/mysql-test/suite/galera/t/galera_forced_binlog_format_ctas.test
+++ b/mysql-test/suite/galera/t/galera_forced_binlog_format_ctas.test
@@ -1,6 +1,6 @@
 --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;
 
diff --git a/mysql-test/suite/galera/t/galera_gra_log.test b/mysql-test/suite/galera/t/galera_gra_log.test
index 23561d9a2b1..ad19bb44118 100644
--- a/mysql-test/suite/galera/t/galera_gra_log.test
+++ b/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
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 9bb07371f92..f61bef4909b 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_ist_mysqldump.test b/mysql-test/suite/galera/t/galera_ist_mysqldump.test
index 7bfca0334fa..73b406d016b 100644
--- a/mysql-test/suite/galera/t/galera_ist_mysqldump.test
+++ b/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
diff --git a/mysql-test/suite/galera/t/galera_ist_restart_joiner.test b/mysql-test/suite/galera/t/galera_ist_restart_joiner.test
index 940b511f752..0c31cf4ab58 100644
--- a/mysql-test/suite/galera/t/galera_ist_restart_joiner.test
+++ b/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
-
diff --git a/mysql-test/suite/galera/t/galera_kill_ddl.test b/mysql-test/suite/galera/t/galera_kill_ddl.test
index 1034b81eddf..2b59bcbad95 100644
--- a/mysql-test/suite/galera/t/galera_kill_ddl.test
+++ b/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
diff --git a/mysql-test/suite/galera/t/galera_partition.test b/mysql-test/suite/galera/t/galera_partition.test
index d69f87b6472..d85ec5f5994 100644
--- a/mysql-test/suite/galera/t/galera_partition.test
+++ b/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;
-
-
-
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 d72d8a9ba40..fde02d6b9a8 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_replica_no_gtid.test b/mysql-test/suite/galera/t/galera_replica_no_gtid.test
index 8cc88ef211a..12e9038dc1c 100644
--- a/mysql-test/suite/galera/t/galera_replica_no_gtid.test
+++ b/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;
 
diff --git a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test b/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
index e3a8b749cb4..9a11a174dfe 100644
--- a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
+++ b/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
diff --git a/mysql-test/suite/galera/t/galera_ssl_compression.test b/mysql-test/suite/galera/t/galera_ssl_compression.test
index 75f92c5b2f4..1df4aa26ebb 100644
--- a/mysql-test/suite/galera/t/galera_ssl_compression.test
+++ b/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");
diff --git a/mysql-test/suite/galera/t/galera_ssl_upgrade.test b/mysql-test/suite/galera/t/galera_ssl_upgrade.test
index 2c55238809f..c09615527fd 100644
--- a/mysql-test/suite/galera/t/galera_ssl_upgrade.test
+++ b/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\\(\\)");
diff --git a/mysql-test/suite/galera/t/galera_toi_ddl_error.test b/mysql-test/suite/galera/t/galera_toi_ddl_error.test
index 6ee2a6e9b16..474828311b9 100644
--- a/mysql-test/suite/galera/t/galera_toi_ddl_error.test
+++ b/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.");
\ No newline at end of file
+CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query\\.");
diff --git a/mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test b/mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test
index 5a00048a90e..e5bff5d8dc4 100644
--- a/mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test
+++ b/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\\.");
diff --git a/mysql-test/suite/galera/t/galera_var_slave_threads.test b/mysql-test/suite/galera/t/galera_var_slave_threads.test
index 4a2dd07098c..66909baff07 100644
--- a/mysql-test/suite/galera/t/galera_var_slave_threads.test
+++ b/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;
diff --git a/mysql-test/suite/galera/t/galera_var_wsrep_start_position.test b/mysql-test/suite/galera/t/galera_var_wsrep_start_position.test
index 43fd09b902c..24e2e033676 100644
--- a/mysql-test/suite/galera/t/galera_var_wsrep_start_position.test
+++ b/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
diff --git a/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test b/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test
index c14dd7b8a0e..c868e5e8e5b 100644
--- a/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test
+++ b/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;
 
diff --git a/mysql-test/suite/galera/t/galera_wan.test b/mysql-test/suite/galera/t/galera_wan.test
index ca86a3000a6..b3dc190dc06 100644
--- a/mysql-test/suite/galera/t/galera_wan.test
+++ b/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;
-
diff --git a/mysql-test/suite/galera/t/galera_wsrep_provider_options_syntax.test b/mysql-test/suite/galera/t/galera_wsrep_provider_options_syntax.test
index fe1abcf6c35..04d78a306a8 100644
--- a/mysql-test/suite/galera/t/galera_wsrep_provider_options_syntax.test
+++ b/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";
diff --git a/mysql-test/suite/galera/t/mdev-28433.test b/mysql-test/suite/galera/t/mdev-28433.test
index ddee3618fee..c501519561c 100644
--- a/mysql-test/suite/galera/t/mdev-28433.test
+++ b/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.
diff --git a/mysql-test/suite/galera/t/mdev-31651.test b/mysql-test/suite/galera/t/mdev-31651.test
index 3598057a53f..ebd6ff6ac44 100644
--- a/mysql-test/suite/galera/t/mdev-31651.test
+++ b/mysql-test/suite/galera/t/mdev-31651.test
@@ -1,8 +1,7 @@
 --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
diff --git a/mysql-test/suite/galera/t/versioning_trx_id.test b/mysql-test/suite/galera/t/versioning_trx_id.test
index fc9ea18eeb4..22111d6b889 100644
--- a/mysql-test/suite/galera/t/versioning_trx_id.test
+++ b/mysql-test/suite/galera/t/versioning_trx_id.test
@@ -1,6 +1,6 @@
 --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
 
diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def
index f2e6f9802ce..bcd0fb03478 100644
--- a/mysql-test/suite/galera_3nodes/disabled.def
+++ b/mysql-test/suite/galera_3nodes/disabled.def
@@ -12,7 +12,6 @@
 
 galera_2_cluster : MDEV-32631 galera_2_cluster: before_rollback(): Assertion `0' failed
 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
 GCF-354 : MDEV-25614 Galera test failure on GCF-354
diff --git a/mysql-test/suite/galera_3nodes/include/galera_resume.inc b/mysql-test/suite/galera_3nodes/include/galera_resume.inc
index af8f2b956fd..3b913cd665a 100644
--- a/mysql-test/suite/galera_3nodes/include/galera_resume.inc
+++ b/mysql-test/suite/galera_3nodes/include/galera_resume.inc
@@ -6,4 +6,3 @@
         system("kill -SIGCONT $mysqld_pid");
         exit(0);
 EOF
-
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-354.result b/mysql-test/suite/galera_3nodes/r/GCF-354.result
index 2b1399e6265..3fdd44fe9d3 100644
--- a/mysql-test/suite/galera_3nodes/r/GCF-354.result
+++ b/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");
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-363.result b/mysql-test/suite/galera_3nodes/r/GCF-363.result
index a7b811f794a..0dadff2673f 100644
--- a/mysql-test/suite/galera_3nodes/r/GCF-363.result
+++ b/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;
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-376.result b/mysql-test/suite/galera_3nodes/r/GCF-376.result
index 7b535a01ed4..bf996963a3d 100644
--- a/mysql-test/suite/galera_3nodes/r/GCF-376.result
+++ b/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: ");
diff --git a/mysql-test/suite/galera_3nodes/r/MDEV-29171.result b/mysql-test/suite/galera_3nodes/r/MDEV-29171.result
index 55513ff53af..3a91bfea211 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-features#119.result b/mysql-test/suite/galera_3nodes/r/galera-features#119.result
index aa49e4e5284..704e25c95b4 100644
--- a/mysql-test/suite/galera_3nodes/r/galera-features#119.result
+++ b/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: ");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_evs_suspect_timeout.result b/mysql-test/suite/galera_3nodes/r/galera_evs_suspect_timeout.result
index 1910106c646..b280a803b37 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_evs_suspect_timeout.result
+++ b/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(*)
diff --git a/mysql-test/suite/galera_3nodes/r/galera_garbd.result b/mysql-test/suite/galera_3nodes/r/galera_garbd.result
index ebc5fdf33f4..676ba7e8a0e 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_garbd.result
+++ b/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\\)");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_garbd_backup.result b/mysql-test/suite/galera_3nodes/r/galera_garbd_backup.result
index 4a5e9a4530c..fdf3f5abde0 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_garbd_backup.result
+++ b/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\\)");
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 a35f31da422..ffc5ec0627a 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.result
+++ b/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;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result
index 934218492d6..4573834cb45 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result
@@ -1,7 +1,7 @@
 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");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result
index 1813607517a..fdea4154626 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result
+++ b/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\\.");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result
index a88909f4bfb..7811059db42 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result
+++ b/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;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result
index d85f121b0f7..ea185bf676a 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result
@@ -94,9 +94,9 @@ SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
 connection node_1;
 DROP TABLE t1;
-call mtr.add_suppression("WSREP: Send action {\(.*\), STATE_REQUEST} returned -107 \\(Transport endpoint is not connected\\)");
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Send action {(.*), STATE_REQUEST} returned -107 \\(Transport endpoint is not connected\\)");
+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\\.");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_pc_bootstrap.result b/mysql-test/suite/galera_3nodes/r/galera_pc_bootstrap.result
index 8cdd62db959..cb12e9d865e 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_pc_bootstrap.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_pc_bootstrap.result
@@ -1,6 +1,6 @@
 connection node_2;
 connection node_1;
-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\\(\\)");
 connection node_1;
 connection node_2;
 connection node_3;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_safe_to_bootstrap.result b/mysql-test/suite/galera_3nodes/r/galera_safe_to_bootstrap.result
index 5d4b1d43fd6..2aefefaad00 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_safe_to_bootstrap.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_safe_to_bootstrap.result
@@ -43,10 +43,10 @@ CALL mtr.add_suppression("WSREP: moving position backwards: [0-9]+ -> 0");
 CALL mtr.add_suppression("Failed to prepare for incremental state transfer");
 CALL mtr.add_suppression("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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg()");
+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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg\\(\\)");
 connection node_3;
 CALL mtr.add_suppression("WSREP: no nodes coming from prim view, prim not possible");
 CALL mtr.add_suppression("WSREP: It may not be safe to bootstrap the cluster from this node");
@@ -56,10 +56,10 @@ CALL mtr.add_suppression("WSREP: moving position backwards: [0-9]+ -> 0");
 CALL mtr.add_suppression("Failed to prepare for incremental state transfer");
 CALL mtr.add_suppression("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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg()");
+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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg\\(\\)");
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/suite/galera_3nodes/r/galera_toi_vote.result b/mysql-test/suite/galera_3nodes/r/galera_toi_vote.result
index 13caead79d3..d8d3abe40e9 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_toi_vote.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_toi_vote.result
@@ -19,4 +19,4 @@ disconnect node_3;
 connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 Killing server ...
 # restart
-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\\.");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_vote_rejoin_mysqldump.result b/mysql-test/suite/galera_3nodes/r/galera_vote_rejoin_mysqldump.result
index cacf1298058..124b9d1976e 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_vote_rejoin_mysqldump.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_vote_rejoin_mysqldump.result
@@ -1,8 +1,8 @@
 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';
@@ -77,7 +77,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");
 connection node_2;
 # restart
 connection node_1;
diff --git a/mysql-test/suite/galera_3nodes/r/inconsistency_shutdown.result b/mysql-test/suite/galera_3nodes/r/inconsistency_shutdown.result
index 83c5b015a50..cd4087e01ca 100644
--- a/mysql-test/suite/galera_3nodes/r/inconsistency_shutdown.result
+++ b/mysql-test/suite/galera_3nodes/r/inconsistency_shutdown.result
@@ -135,8 +135,8 @@ SET SESSION wsrep_sync_wait = 15;
 SET GLOBAL wsrep_on=OFF;
 # restart
 DROP TABLE t1;
-CALL mtr.add_suppression('Can\'t find record in \'t1\'');
-CALL mtr.add_suppression('Update_rows_v1 apply failed');
-CALL mtr.add_suppression('Inconsistency detected: Inconsistent by consensus on');
-CALL mtr.add_suppression('last left .* greater than drain seqno');
-CALL mtr.add_suppression('WSREP: Failed to apply write set:');
+CALL mtr.add_suppression("Can't find record in 't1'");
+CALL mtr.add_suppression("Update_rows_v1 apply failed");
+CALL mtr.add_suppression("Inconsistency detected: Inconsistent by consensus on");
+CALL mtr.add_suppression("last left .* greater than drain seqno");
+CALL mtr.add_suppression("WSREP: Failed to apply write set: ");
diff --git a/mysql-test/suite/galera_3nodes/t/GCF-354.test b/mysql-test/suite/galera_3nodes/t/GCF-354.test
index e1459734cf3..44dfa3deeb7 100644
--- a/mysql-test/suite/galera_3nodes/t/GCF-354.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-354.test
@@ -88,18 +88,18 @@ USE test;
 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready'
 --source include/wait_condition.inc
 --echo 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
 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready'
 --source include/wait_condition.inc
 --echo 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");
 
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes/t/GCF-363.test b/mysql-test/suite/galera_3nodes/t/GCF-363.test
index 00af02126af..1e245597f08 100644
--- a/mysql-test/suite/galera_3nodes/t/GCF-363.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-363.test
@@ -60,15 +60,15 @@ SELECT * FROM t1;
 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");
 
diff --git a/mysql-test/suite/galera_3nodes/t/GCF-376.test b/mysql-test/suite/galera_3nodes/t/GCF-376.test
index 20b9703f835..930d89e7f4f 100644
--- a/mysql-test/suite/galera_3nodes/t/GCF-376.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-376.test
@@ -113,6 +113,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: ");
diff --git a/mysql-test/suite/galera_3nodes/t/MDEV-29171.test b/mysql-test/suite/galera_3nodes/t/MDEV-29171.test
index 9e35cd0e0d9..df1282609f0 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-features#119.test b/mysql-test/suite/galera_3nodes/t/galera-features#119.test
index d1dd435c5e4..0effe780a22 100644
--- a/mysql-test/suite/galera_3nodes/t/galera-features#119.test
+++ b/mysql-test/suite/galera_3nodes/t/galera-features#119.test
@@ -60,13 +60,12 @@ DROP TABLE test.t1;
 --source include/start_mysqld.inc
 
 --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: ");
 
 
 # Restore original auto_increment_offset values.
 --source ../galera/include/auto_increment_offset_restore.inc
-
diff --git a/mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test b/mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test
index 8848e698c25..c0b23e4cc8e 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test
@@ -72,7 +72,7 @@ SELECT COUNT(*) FROM t1;
 --source include/galera_wait_ready.inc
 
 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;
diff --git a/mysql-test/suite/galera_3nodes/t/galera_garbd.test b/mysql-test/suite/galera_3nodes/t/galera_garbd.test
index 05b1b25930f..da1956d8c85 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_garbd.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_garbd.test
@@ -81,10 +81,10 @@ let $restart_noprint=2;
 # Workaround for galera#101
 
 --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\\)");
diff --git a/mysql-test/suite/galera_3nodes/t/galera_garbd_backup.test b/mysql-test/suite/galera_3nodes/t/galera_garbd_backup.test
index f5eaf6fc59a..d1d8e643d8e 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_garbd_backup.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_garbd_backup.test
@@ -127,10 +127,10 @@ let $restart_noprint=2;
 --source ../galera/include/auto_increment_offset_restore.inc
 
 --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\\)");
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 f41230bc8e6..f00972b0461 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test
@@ -316,17 +316,18 @@ SELECT COUNT(*) FROM t1;
 #
 --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");
 
 --echo # cleanup
 --connection node_1
+call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration");
 
 DROP PROCEDURE insert_row;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test
index 27e71da29fa..0e0112f86c7 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test
@@ -3,8 +3,8 @@
 --source include/check_ipv6.inc
 --source include/force_restart.inc
 
-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");
 
 --let $galera_connection_name = node_3
 --let $galera_server_number = 3
@@ -86,8 +86,9 @@ SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
 
 --source ../galera/include/auto_increment_offset_restore.inc
 --source suite/galera/include/galera_sst_restore.inc
+
 --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");
 
 # Restore original auto_increment_offset values.
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_A.test b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_A.test
index db8bf90cb5c..bb25b1dd9d1 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_A.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_A.test
@@ -259,12 +259,12 @@ INSERT INTO t1 VALUES (9, 2);
 
 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\\.");
 
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_B.test b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_B.test
index d06cdcc8ae4..b5983c384ed 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_B.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_B.test
@@ -270,13 +270,13 @@ SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debu
 
 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
 
diff --git a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_C.test b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_C.test
index d1111e9fd4a..d914482a100 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_C.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_C.test
@@ -295,13 +295,13 @@ INSERT INTO t1 VALUES (9, 2);
 
 DROP TABLE t1;
 
-call mtr.add_suppression("WSREP: Send action {\(.*\), STATE_REQUEST} returned -107 \\(Transport endpoint is not connected\\)");
-call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+call mtr.add_suppression("WSREP: Send action {(.*), STATE_REQUEST} returned -107 \\(Transport endpoint is not connected\\)");
+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\\.");
 
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes/t/galera_pc_bootstrap.test b/mysql-test/suite/galera_3nodes/t/galera_pc_bootstrap.test
index 58a67c7b32b..7020400e5ea 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_pc_bootstrap.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_pc_bootstrap.test
@@ -5,7 +5,7 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
-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\\(\\)");
 
 #
 # Create connection node_3 and save auto increment variables.
diff --git a/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test b/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test
index 65b4000cd1f..80482151518 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test
@@ -191,10 +191,10 @@ CALL mtr.add_suppression("WSREP: moving position backwards: [0-9]+ -> 0");
 CALL mtr.add_suppression("Failed to prepare for incremental state transfer");
 CALL mtr.add_suppression("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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg()");
+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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg\\(\\)");
 
 --connection node_3
 CALL mtr.add_suppression("WSREP: no nodes coming from prim view, prim not possible");
@@ -205,10 +205,10 @@ CALL mtr.add_suppression("WSREP: moving position backwards: [0-9]+ -> 0");
 CALL mtr.add_suppression("Failed to prepare for incremental state transfer");
 CALL mtr.add_suppression("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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg()");
+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("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg\\(\\)");
 
 SHOW CREATE TABLE t1;
 
diff --git a/mysql-test/suite/galera_3nodes/t/galera_toi_vote.test b/mysql-test/suite/galera_3nodes/t/galera_toi_vote.test
index 7b5682ed030..6bc87cf8874 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_toi_vote.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_toi_vote.test
@@ -61,7 +61,7 @@ SET SESSION wsrep_sync_wait=0;
 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready'
 --source include/wait_condition.inc
 
-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\\.");
 
 # Restore original auto_increment_offset values.
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes/t/galera_var_node_address.cnf b/mysql-test/suite/galera_3nodes/t/galera_var_node_address.cnf
index aa0c47f1e0f..60dd48dba52 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_var_node_address.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_var_node_address.cnf
@@ -5,4 +5,3 @@ wsrep_node_address=127.0.0.1
 
 [mysqld.3]
 wsrep_node_address=localhost
-
diff --git a/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test b/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test
index 7a9c4e83f87..347433a6f14 100644
--- a/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test
+++ b/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test
@@ -180,11 +180,11 @@ SET GLOBAL wsrep_on=OFF;
 
 DROP TABLE t1;
 
-CALL mtr.add_suppression('Can\'t find record in \'t1\'');
-CALL mtr.add_suppression('Update_rows_v1 apply failed');
-CALL mtr.add_suppression('Inconsistency detected: Inconsistent by consensus on');
-CALL mtr.add_suppression('last left .* greater than drain seqno');
-CALL mtr.add_suppression('WSREP: Failed to apply write set:');
+CALL mtr.add_suppression("Can't find record in 't1'");
+CALL mtr.add_suppression("Update_rows_v1 apply failed");
+CALL mtr.add_suppression("Inconsistency detected: Inconsistent by consensus on");
+CALL mtr.add_suppression("last left .* greater than drain seqno");
+CALL mtr.add_suppression("WSREP: Failed to apply write set: ");
 
 # Restore original auto_increment_offset values.
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test
index 20d5955e4fc..db675f64ca9 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test
@@ -54,5 +54,4 @@ CALL mtr.add_suppression("WSREP: failed to send SR rollback for ");
 --connection node_3
 --source include/galera_wait_ready.inc
 
-
 --enable_ps2_protocol
diff --git a/mysql-test/suite/galera_sr/r/MDEV-30838.result b/mysql-test/suite/galera_sr/r/MDEV-30838.result
index 6997b9c4d5d..2b55827485f 100644
--- a/mysql-test/suite/galera_sr/r/MDEV-30838.result
+++ b/mysql-test/suite/galera_sr/r/MDEV-30838.result
@@ -12,4 +12,4 @@ SELECT * FROM t1;
 f1
 SET debug_dbug='-d,ib_create_table_fail_too_many_trx';
 DROP TABLE t1;
-CALL mtr.add_suppression("Error writing into mysql.wsrep_streaming_log: 177");
+CALL mtr.add_suppression("Error writing into mysql\\.wsrep_streaming_log: 177");
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result b/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result
index 654b86d56a8..5d1416d3fa7 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result
@@ -61,7 +61,7 @@ EXPECT_0
 0
 DROP TABLE t1;
 connection node_2b;
-CALL mtr.add_suppression("WSREP: Failed to replicate rollback fragment for");
+CALL mtr.add_suppression("WSREP: Failed to replicate rollback fragment for ");
 disconnect node_2;
 connect node_2, 127.0.0.1, root, , test, $NODE_MYPORT_2;
 disconnect node_2a;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
index 6789990f18e..b0f04b8f457 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
@@ -1,8 +1,8 @@
 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';
@@ -57,4 +57,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");
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
index 34995d35a4f..fbf62ea42a1 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
@@ -3,7 +3,7 @@ connection node_1;
 connection node_1;
 connection node_2;
 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;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE = InnoDB;
 connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_ws_size.result b/mysql-test/suite/galera_sr/r/galera_sr_ws_size.result
index b7bdd94dd68..d3ecb699732 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_ws_size.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_ws_size.result
@@ -30,7 +30,7 @@ COUNT(*) = 100
 DROP TABLE t1;
 DROP TABLE ten;
 connection node_1;
-call mtr.add_suppression('WSREP: transaction size limit.*');
-call mtr.add_suppression('WSREP: rbr write fail.*');
-call mtr.add_suppression('WSREP: Maximum writeset size exceeded by.*');
-call mtr.add_suppression('WSREP: transaction size exceeded.*');
+call mtr.add_suppression('WSREP: transaction size limit');
+call mtr.add_suppression('WSREP: rbr write fail');
+call mtr.add_suppression('WSREP: Maximum writeset size exceeded by ');
+call mtr.add_suppression('WSREP: transaction size exceeded');
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_ws_size2.result b/mysql-test/suite/galera_sr/r/galera_sr_ws_size2.result
index 6bd8b6b8212..94aeef9b69e 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_ws_size2.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_ws_size2.result
@@ -23,12 +23,12 @@ COUNT(*) = 0
 connection node_1;
 DROP TABLE t1;
 DROP TABLE ten;
-call mtr.add_suppression('WSREP: SR rollback replication failure.*');
-call mtr.add_suppression('WSREP: transaction size limit.*');
-call mtr.add_suppression('WSREP: SR rbr write fail.*');
-call mtr.add_suppression('WSREP: Maximum writeset size exceeded by.*');
-call mtr.add_suppression('WSREP: transaction size exceeded.*');
-call mtr.add_suppression('WSREP: fragment replication failed:');
+call mtr.add_suppression('WSREP: SR rollback replication failure');
+call mtr.add_suppression('WSREP: transaction size limit');
+call mtr.add_suppression('WSREP: SR rbr write fail');
+call mtr.add_suppression('WSREP: Maximum writeset size exceeded by ');
+call mtr.add_suppression('WSREP: transaction size exceeded');
+call mtr.add_suppression('WSREP: fragment replication failed: ');
 call mtr.add_suppression('WSREP: post commit failed for SR rollback');
-call mtr.add_suppression('WSREP: pre_commit for SR rollback returned 2, thd:*');
-call mtr.add_suppression('WSREP: wsrep_rollback failed to send SR ROLLBACK for *');
+call mtr.add_suppression('WSREP: pre_commit for SR rollback returned 2, thd: ');
+call mtr.add_suppression('WSREP: wsrep_rollback failed to send SR ROLLBACK for ');
diff --git a/mysql-test/suite/galera_sr/r/mdev_18631.result b/mysql-test/suite/galera_sr/r/mdev_18631.result
index 779ae5266a3..aa3b2c252e8 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/GCF-1008.test b/mysql-test/suite/galera_sr/t/GCF-1008.test
index c6926840bd1..9c7f015c13f 100644
--- a/mysql-test/suite/galera_sr/t/GCF-1008.test
+++ b/mysql-test/suite/galera_sr/t/GCF-1008.test
@@ -15,4 +15,3 @@
 
 --let $galera_sync_point = before_certify_apply_monitor_enter
 --source GCF-1008.inc
-
diff --git a/mysql-test/suite/galera_sr/t/GCF-1051.test b/mysql-test/suite/galera_sr/t/GCF-1051.test
index 1db4ed15c41..5e52701165e 100644
--- a/mysql-test/suite/galera_sr/t/GCF-1051.test
+++ b/mysql-test/suite/galera_sr/t/GCF-1051.test
@@ -47,5 +47,4 @@ SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
-
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/GCF-845.test b/mysql-test/suite/galera_sr/t/GCF-845.test
index 316317c6a10..6ef50d3a1d5 100644
--- a/mysql-test/suite/galera_sr/t/GCF-845.test
+++ b/mysql-test/suite/galera_sr/t/GCF-845.test
@@ -27,4 +27,3 @@ DROP TABLE t1;
 --let $assert_text = No BF-BF log line found
 --let $assert_only_after = CURRENT_TEST
 --source include/assert_grep.inc
-
diff --git a/mysql-test/suite/galera_sr/t/GCF-851.test b/mysql-test/suite/galera_sr/t/GCF-851.test
index 28d5302a422..3a6edab6b56 100644
--- a/mysql-test/suite/galera_sr/t/GCF-851.test
+++ b/mysql-test/suite/galera_sr/t/GCF-851.test
@@ -21,4 +21,3 @@ SELECT COUNT(*) > 0 FROM t1;
 --connection node_1
 SELECT COUNT(*) > 0 FROM t1;
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera_sr/t/GCF-889.test b/mysql-test/suite/galera_sr/t/GCF-889.test
index e785b282019..e4cb3578011 100644
--- a/mysql-test/suite/galera_sr/t/GCF-889.test
+++ b/mysql-test/suite/galera_sr/t/GCF-889.test
@@ -26,4 +26,3 @@ SET GLOBAL wsrep_ignore_apply_errors = 7;
 
 --connection node_1
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera_sr/t/MDEV-21613.test b/mysql-test/suite/galera_sr/t/MDEV-21613.test
index 8a1fea1b7f5..4d32fee900a 100644
--- a/mysql-test/suite/galera_sr/t/MDEV-21613.test
+++ b/mysql-test/suite/galera_sr/t/MDEV-21613.test
@@ -21,12 +21,10 @@ INSERT INTO t1 VALUES(1), (2);
 --connection node_ctrl
 SET DEBUG_SYNC = "now WAIT_FOR fragment_removal_reached";
 
-
 --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
 --connection node_1a
 TRUNCATE TABLE t1;
 
-
 --connection node_1
 --error ER_LOCK_DEADLOCK
 --reap
diff --git a/mysql-test/suite/galera_sr/t/MDEV-30838.test b/mysql-test/suite/galera_sr/t/MDEV-30838.test
index 39ca7d2a375..3270c523daf 100644
--- a/mysql-test/suite/galera_sr/t/MDEV-30838.test
+++ b/mysql-test/suite/galera_sr/t/MDEV-30838.test
@@ -15,4 +15,4 @@ COMMIT;
 SELECT * FROM t1;
 SET debug_dbug='-d,ib_create_table_fail_too_many_trx';
 DROP TABLE t1;
-CALL mtr.add_suppression("Error writing into mysql.wsrep_streaming_log: 177");
+CALL mtr.add_suppression("Error writing into mysql\\.wsrep_streaming_log: 177");
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test b/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test
index f6a1b11cba9..25cd8f3005b 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test
@@ -101,7 +101,7 @@ SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
 DROP TABLE t1;
 
 --connection node_2b
-CALL mtr.add_suppression("WSREP: Failed to replicate rollback fragment for");
+CALL mtr.add_suppression("WSREP: Failed to replicate rollback fragment for ");
 
 --disconnect node_2
 --connect node_2, 127.0.0.1, root, , test, $NODE_MYPORT_2
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
index 5d4a58b2d03..035ef873700 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
@@ -9,7 +9,7 @@
 --let $node_2=node_2
 --source ../galera/include/auto_increment_offset_save.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
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE = InnoDB;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_ws_size.test b/mysql-test/suite/galera_sr/t/galera_sr_ws_size.test
index 98f6e796ef6..c8ae06637ed 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_ws_size.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_ws_size.test
@@ -64,7 +64,7 @@ DROP TABLE ten;
 --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig';
 --enable_query_log
 
-call mtr.add_suppression('WSREP: transaction size limit.*');
-call mtr.add_suppression('WSREP: rbr write fail.*');
-call mtr.add_suppression('WSREP: Maximum writeset size exceeded by.*');
-call mtr.add_suppression('WSREP: transaction size exceeded.*');
+call mtr.add_suppression('WSREP: transaction size limit');
+call mtr.add_suppression('WSREP: rbr write fail');
+call mtr.add_suppression('WSREP: Maximum writeset size exceeded by ');
+call mtr.add_suppression('WSREP: transaction size exceeded');
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_ws_size2.test b/mysql-test/suite/galera_sr/t/galera_sr_ws_size2.test
index 2b9bc4819b8..07b79e49461 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_ws_size2.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_ws_size2.test
@@ -51,12 +51,12 @@ SELECT COUNT(*) = 0 FROM t1;
 DROP TABLE t1;
 DROP TABLE ten;
 
-call mtr.add_suppression('WSREP: SR rollback replication failure.*');
-call mtr.add_suppression('WSREP: transaction size limit.*');
-call mtr.add_suppression('WSREP: SR rbr write fail.*');
-call mtr.add_suppression('WSREP: Maximum writeset size exceeded by.*');
-call mtr.add_suppression('WSREP: transaction size exceeded.*');
-call mtr.add_suppression('WSREP: fragment replication failed:');
+call mtr.add_suppression('WSREP: SR rollback replication failure');
+call mtr.add_suppression('WSREP: transaction size limit');
+call mtr.add_suppression('WSREP: SR rbr write fail');
+call mtr.add_suppression('WSREP: Maximum writeset size exceeded by ');
+call mtr.add_suppression('WSREP: transaction size exceeded');
+call mtr.add_suppression('WSREP: fragment replication failed: ');
 call mtr.add_suppression('WSREP: post commit failed for SR rollback');
-call mtr.add_suppression('WSREP: pre_commit for SR rollback returned 2, thd:*');
-call mtr.add_suppression('WSREP: wsrep_rollback failed to send SR ROLLBACK for *');
+call mtr.add_suppression('WSREP: pre_commit for SR rollback returned 2, thd: ');
+call mtr.add_suppression('WSREP: wsrep_rollback failed to send SR ROLLBACK for ');
diff --git a/mysql-test/suite/galera_sr/t/galera_var_ignore_apply_errors_sr.test b/mysql-test/suite/galera_sr/t/galera_var_ignore_apply_errors_sr.test
index ea40f58db73..3097318dafb 100644
--- a/mysql-test/suite/galera_sr/t/galera_var_ignore_apply_errors_sr.test
+++ b/mysql-test/suite/galera_sr/t/galera_var_ignore_apply_errors_sr.test
@@ -35,4 +35,4 @@ DROP TABLE t1;
 
 SET GLOBAL wsrep_ignore_apply_errors = 7;
 CALL mtr.add_suppression("Slave SQL: Could not execute Delete_rows event");
-CALL mtr.add_suppression("Can't find record in 't1'");
\ No newline at end of file
+CALL mtr.add_suppression("Can't find record in 't1'");
diff --git a/mysql-test/suite/galera_sr/t/mdev_18631.test b/mysql-test/suite/galera_sr/t/mdev_18631.test
index 0d1ea34c2f2..3e99e9fa9dc 100644
--- a/mysql-test/suite/galera_sr/t/mdev_18631.test
+++ b/mysql-test/suite/galera_sr/t/mdev_18631.test
@@ -3,7 +3,6 @@
 # The configuration is provided in mdev_18631.cnf.
 #
 
-
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
@@ -14,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
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-bugs-900.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-bugs-900.test
index d534fcc5524..e30b8cd5763 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep-bugs-900.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-bugs-900.test
@@ -19,4 +19,4 @@ INSERT INTO t1 VALUES (2);
 COMMIT;
 
 SELECT f1 AS expect_1_and_2 FROM t1;
-DROP TABLE t1;
\ No newline at end of file
+DROP TABLE t1;