From c35b6f133aa8c7c88d14a13593ac2a57d51aa137 Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Tue, 28 Jan 2025 20:47:38 +0100
Subject: [PATCH] galera mtr tests: synchronization between editions/branches
 (10.5)

---
 mysql-test/suite/galera/r/MW-416.result       |  5 +-
 .../suite/galera/r/galera_bf_kill,debug.rdiff |  4 +-
 .../r/galera_ist_MDEV-28423,debug.rdiff       |  2 +-
 .../r/galera_ist_MDEV-28583,debug.rdiff       |  2 +-
 .../r/galera_ist_mariabackup,debug.rdiff      |  4 +-
 ..._mariabackup_innodb_flush_logs,debug.rdiff |  4 +-
 .../galera/r/galera_ist_mysqldump,debug.rdiff |  4 +-
 .../galera/r/galera_ist_rsync,debug.rdiff     |  4 +-
 .../r/galera_sst_mariabackup,debug.rdiff      |  2 +-
 ...alera_sst_mariabackup_data_dir,debug.rdiff |  4 +-
 ...sst_mariabackup_force_recovery,debug.rdiff |  4 +-
 ...era_sst_mariabackup_logarchive,debug.rdiff |  2 +-
 .../galera/r/galera_sst_mysqldump,debug.rdiff |  4 +-
 .../galera_sst_mysqldump_with_key,debug.rdiff |  4 +-
 .../galera/r/galera_sst_rsync,debug.rdiff     |  2 +-
 .../galera/r/galera_sst_rsync2,debug.rdiff    |  4 +-
 .../r/galera_sst_rsync_data_dir,debug.rdiff   |  4 +-
 .../r/galera_sst_rsync_recv_auto,debug.rdiff  |  2 +
 .../suite/galera/r/mysql-wsrep#33,debug.rdiff |  4 +-
 mysql-test/suite/galera/suite.pm              | 30 +++---
 mysql-test/suite/galera/t/MW-416.test         | 94 ++++++++++---------
 .../r/galera-features#115.result              | 41 ++++++++
 .../galera_3nodes/r/galera_2_cluster.result   |  1 -
 .../r/galera_gtid_2_cluster.result            |  8 +-
 mysql-test/suite/galera_3nodes/suite.pm       | 32 ++++---
 .../galera_3nodes/t/galera-features#115.cnf   |  4 +
 .../galera_3nodes/t/galera-features#115.test  | 89 ++++++++++++++++++
 .../galera_3nodes/t/galera_2_cluster.test     |  3 +-
 .../t/galera_gtid_2_cluster.test              | 16 +++-
 mysql-test/suite/galera_3nodes_sr/suite.pm    | 22 ++---
 mysql-test/suite/galera_sr/suite.pm           | 30 +++---
 31 files changed, 293 insertions(+), 142 deletions(-)
 create mode 100644 mysql-test/suite/galera_3nodes/r/galera-features#115.result
 create mode 100644 mysql-test/suite/galera_3nodes/t/galera-features#115.cnf
 create mode 100644 mysql-test/suite/galera_3nodes/t/galera-features#115.test

diff --git a/mysql-test/suite/galera/r/MW-416.result b/mysql-test/suite/galera/r/MW-416.result
index 68406c4dcf4..e5f69caa413 100644
--- a/mysql-test/suite/galera/r/MW-416.result
+++ b/mysql-test/suite/galera/r/MW-416.result
@@ -24,13 +24,13 @@ ALTER VIEW vw AS SELECT 1;
 Got one of the listed errors
 CREATE DATABASE db;
 Got one of the listed errors
-CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP  DO SELECT 1;
+CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP DO SELECT 1;
 Got one of the listed errors
 CREATE FUNCTION fun1() RETURNS int RETURN(1);
 Got one of the listed errors
 CREATE FUNCTION fun1 RETURNS STRING SONAME 'funlib.so';
 Got one of the listed errors
-CREATE PROCEDURE proc1()  BEGIN END;
+CREATE PROCEDURE proc1() BEGIN END;
 Got one of the listed errors
 CREATE INDEX idx ON tbl(id);
 Got one of the listed errors
@@ -111,3 +111,4 @@ mtr
 mysql
 performance_schema
 test
+disconnect userMW416;
diff --git a/mysql-test/suite/galera/r/galera_bf_kill,debug.rdiff b/mysql-test/suite/galera/r/galera_bf_kill,debug.rdiff
index e02acc3de08..098ce2b28a1 100644
--- a/mysql-test/suite/galera/r/galera_bf_kill,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_bf_kill,debug.rdiff
@@ -1,5 +1,5 @@
---- a/home/panda/mariadb-10.5/mysql-test/suite/galera/r/galera_bf_kill.result
-+++ b/home/panda/mariadb-10.5/mysql-test/suite/galera/r/galera_bf_kill.reject
+--- r/galera_bf_kill.result
++++ r/galera_bf_kill,debug.reject
 @@ -77,4 +77,34 @@ a	b
  5	2
  disconnect node_2a;
diff --git a/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff
index 96e5def88ff..8c84321e774 100644
--- a/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff
@@ -1,5 +1,5 @@
 --- r/galera_ist_MDEV-28423.result
-+++ r/galera_ist_MDEV-28423.reject
++++ r/galera_ist_MDEV-28423,debug.reject
 @@ -517,3 +517,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff
index 9e6530aa9f7..51d2a6bf157 100644
--- a/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff
@@ -1,5 +1,5 @@
 --- r/galera_ist_MDEV-28583.result
-+++ r/galera_ist_MDEV-28583.reject
++++ r/galera_ist_MDEV-28583,debug.reject
 @@ -517,3 +517,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff
index adf12c23e4a..243b2a50b2a 100644
--- a/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_ist_mariabackup.result	2021-04-10 14:21:16.141724901 +0300
-+++ r/galera_ist_mariabackup,debug.reject	2021-04-10 14:49:04.455785652 +0300
+--- r/galera_ist_mariabackup.result
++++ r/galera_ist_mariabackup,debug.reject
 @@ -517,3 +517,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff
index c9457d70812..b7a91b010fe 100644
--- a/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_ist_mariabackup_innodb_flush_logs.result	2021-04-10 14:21:52.661886653 +0300
-+++ r/galera_ist_mariabackup_innodb_flush_logs,debug.reject	2021-04-10 14:49:56.740062774 +0300
+--- r/galera_ist_mariabackup_innodb_flush_logs.result
++++ r/galera_ist_mariabackup_innodb_flush_logs,debug.reject
 @@ -172,3 +172,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_ist_mysqldump,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_mysqldump,debug.rdiff
index e4e255deea2..2ba60eff7b4 100644
--- a/mysql-test/suite/galera/r/galera_ist_mysqldump,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_ist_mysqldump,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_ist_mysqldump.result	2021-04-10 14:23:23.158282307 +0300
-+++ r/galera_ist_mysqldump,debug.reject	2021-04-10 15:27:13.316299695 +0300
+--- r/galera_ist_mysqldump.result
++++ r/galera_ist_mysqldump,debug.reject
 @@ -354,6 +354,190 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_ist_rsync,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_rsync,debug.rdiff
index e76b37838fb..f3df998be95 100644
--- a/mysql-test/suite/galera/r/galera_ist_rsync,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_ist_rsync,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_ist_rsync.result	2021-04-10 14:24:05.942467091 +0300
-+++ r/galera_ist_rsync,debug.reject	2021-04-10 14:52:14.236776538 +0300
+--- r/galera_ist_rsync.result
++++ r/galera_ist_rsync,debug.reject
 @@ -517,3 +517,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff
index 3aad611cacb..da294317c27 100644
--- a/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff
@@ -1,5 +1,5 @@
 --- r/galera_sst_mariabackup.result
-+++ r/galera_sst_mariabackup.reject
++++ r/galera_sst_mariabackup,debug.reject
 @@ -516,5 +516,189 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup_data_dir,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mariabackup_data_dir,debug.rdiff
index 870b12de3c9..875d53addd8 100644
--- a/mysql-test/suite/galera/r/galera_sst_mariabackup_data_dir,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_mariabackup_data_dir,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_sst_mariabackup_data_dir.result	2021-04-10 14:26:02.798965488 +0300
-+++ r/galera_sst_mariabackup_data_dir,debug.reject	2021-04-10 14:54:44.825538224 +0300
+--- r/galera_sst_mariabackup_data_dir.result
++++ r/galera_sst_mariabackup_data_dir,debug.reject
 @@ -516,5 +516,189 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup_force_recovery,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mariabackup_force_recovery,debug.rdiff
index bad8355b514..b8469370b0d 100644
--- a/mysql-test/suite/galera/r/galera_sst_mariabackup_force_recovery,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_mariabackup_force_recovery,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_sst_mariabackup.result	2021-04-10 14:25:04.142716409 +0300
-+++ r/galera_sst_mariabackup,debug.reject	2021-04-10 14:53:30.033162191 +0300
+--- r/galera_sst_mariabackup_force_recovery.result
++++ r/galera_sst_mariabackup_force_recovery,debug.reject
 @@ -516,5 +516,189 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive,debug.rdiff
index a9c796da607..0c08f38c138 100644
--- a/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive,debug.rdiff
@@ -1,5 +1,5 @@
 --- r/galera_sst_mariabackup_logarchive.result
-+++ r/galera_sst_mariabackup_logarchive.reject
++++ r/galera_sst_mariabackup_logarchive,debug.reject
 @@ -516,5 +516,189 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_mysqldump,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mysqldump,debug.rdiff
index e73a27ad0ac..d43067b4be0 100644
--- a/mysql-test/suite/galera/r/galera_sst_mysqldump,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_mysqldump,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_sst_mysqldump.result	2021-04-18 13:15:29.909314729 +0300
-+++ r/galera_sst_mysqldump.reject	2021-04-18 13:50:47.096965646 +0300
+--- r/galera_sst_mysqldump.result
++++ r/galera_sst_mysqldump,debug.reject
 @@ -698,6 +698,190 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,debug.rdiff
index 7d73f7a6ae6..2f18ca4772e 100644
--- a/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_sst_mysqldump_with_key.result	2021-04-10 14:33:29.441606621 +0300
-+++ r/galera_sst_mysqldump_with_key,debug.reject	2021-04-10 15:02:45.367881573 +0300
+--- r/galera_sst_mysqldump_with_key.result
++++ r/galera_sst_mysqldump_with_key,debug.reject
 @@ -358,6 +358,190 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_rsync,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_rsync,debug.rdiff
index 87f8a463bd0..157a4db3204 100644
--- a/mysql-test/suite/galera/r/galera_sst_rsync,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_rsync,debug.rdiff
@@ -1,5 +1,5 @@
 --- galera_sst_rsync.result
-+++ galera_sst_rsync.reject
++++ galera_sst_rsync,debug.reject
 @@ -516,3 +516,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_rsync2,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_rsync2,debug.rdiff
index 14f67770572..ae242e2b216 100644
--- a/mysql-test/suite/galera/r/galera_sst_rsync2,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_rsync2,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_sst_rsync2.result	2021-04-10 14:34:48.646288119 +0300
-+++ r/galera_sst_rsync2,debug.reject	2021-04-10 15:04:10.276286996 +0300
+--- r/galera_sst_rsync2.result
++++ r/galera_sst_rsync2,debug.reject
 @@ -516,3 +516,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_rsync_data_dir,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_rsync_data_dir,debug.rdiff
index 00b42d53b51..558a8e7cd07 100644
--- a/mysql-test/suite/galera/r/galera_sst_rsync_data_dir,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_rsync_data_dir,debug.rdiff
@@ -1,5 +1,5 @@
---- r/galera_sst_rsync_data_dir.result	2021-04-10 14:35:28.090610315 +0300
-+++ r/galera_sst_rsync_data_dir,debug.reject	2021-04-10 15:50:26.945234998 +0300
+--- r/galera_sst_rsync_data_dir.result
++++ r/galera_sst_rsync_data_dir,debug.reject
 @@ -516,3 +516,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto,debug.rdiff
index 5bc47c58303..0b1e2f2169c 100644
--- a/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto,debug.rdiff
@@ -1,3 +1,5 @@
+--- r/galera_sst_rsync_recv_auto.result
++++ r/galera_sst_rsync_recv_auto,debug.reject
 @@ -516,3 +516,187 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/mysql-wsrep#33,debug.rdiff b/mysql-test/suite/galera/r/mysql-wsrep#33,debug.rdiff
index 971f11bb8ec..f75f92a3d7d 100644
--- a/mysql-test/suite/galera/r/mysql-wsrep#33,debug.rdiff
+++ b/mysql-test/suite/galera/r/mysql-wsrep#33,debug.rdiff
@@ -1,5 +1,5 @@
---- r/mysql-wsrep#33.result	2021-04-10 14:36:42.663191908 +0300
-+++ r/mysql-wsrep#33,debug.reject	2021-04-10 15:43:02.420168969 +0300
+--- r/mysql-wsrep#33.result
++++ r/mysql-wsrep#33,debug.reject
 @@ -698,6 +698,190 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 4c4d26db4c5..825525765ca 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -10,20 +10,20 @@ return wsrep_not_ok() if wsrep_not_ok();
 
 push @::global_suppressions,
   (
-     qr(WSREP: wsrep_sst_receive_address is set to '127.0.0.1),
+     qr(WSREP: wsrep_sst_receive_address is set to '127\.0\.0\.1),
      qr(WSREP: Could not open saved state file for reading: .*),
      qr(WSREP: Could not open state file for reading: .*),
-     qr(WSREP: Gap in state sequence. Need state transfer.),
+     qr(WSREP: Gap in state sequence\. Need state transfer\.),
      qr(WSREP: Failed to prepare for incremental state transfer:),
-     qr(WSREP:.*down context.*),
+     qr(WSREP: .*down context.*),
      qr(WSREP: Failed to send state UUID:),
      qr(WSREP: last inactive check more than .* skipping check),
-     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned.),
+     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned\.),
      qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
      qr(WSREP: Quorum: No node with complete state),
      qr(WSREP: Initial position was provided by configuration or SST, avoiding override),
      qr|WSREP: discarding established \(time wait\) .*|,
-     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside. Will use that one.),
+     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside\. Will use that one\.),
      qr(WSREP: evs::proto.*),
      qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|,
      qr(WSREP: no nodes coming from prim view, prim not possible),
@@ -46,25 +46,25 @@ push @::global_suppressions,
      qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
      qr(WSREP: gcs connect failed: Connection timed out),
      qr|WSREP: wsrep::connect\(.*\) failed: 7|,
-     qr(WSREP: SYNC message from member .* in non-primary configuration. Ignored.),
+     qr(WSREP: SYNC message from member .* in non-primary configuration\. Ignored\.),
      qr(WSREP: Could not find peer:),
      qr(WSREP: TO isolation failed for: .*),
      qr|WSREP: gcs_caused\(\) returned .*|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored.|,
-     qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled. Expect abort.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored\.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored\.|,
+     qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled\. Expect abort\.|,
      qr(WSREP: Action message in non-primary configuration from member [0-9]*),
      qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*),
      qr(WSREP: discarding established .*),
      qr|WSREP: .*core_handle_uuid_msg.*|,
-     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0. WSREP_SYNC_WAIT_BEFORE_READ is on),
-     qr|WSREP: JOIN message from member .* in non-primary configuration. Ignored.|,
-     qr|Query apply failed:*|,
-     qr(WSREP: Ignoring error*),
+     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0\. WSREP_SYNC_WAIT_BEFORE_READ is on),
+     qr|WSREP: JOIN message from member .* in non-primary configuration\. Ignored\.|,
+     qr|WSREP: .*Query apply failed:.*|,
+     qr(WSREP: Ignoring error.*),
      qr(WSREP: Failed to remove page file .*),
      qr(WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*),
-     qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\). Will retry in new primary component.|,
-     qr|WSREP: Send action \{.* STATE_REQUEST} returned -107 \(Transport endpoint is not connected\)|,
+     qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.|,
+     qr|WSREP: Send action \{.* STATE_REQUEST\} returned -107 \(Transport endpoint is not connected\)|,
      qr|WSREP: Trying to continue unpaused monitor|,
      qr|WSREP: Wait for gtid returned error 3 while waiting for prior transactions to commit before setting position|,
      qr|WSREP: Failed to report last committed|,
diff --git a/mysql-test/suite/galera/t/MW-416.test b/mysql-test/suite/galera/t/MW-416.test
index 9d876233eb4..178c7760da7 100644
--- a/mysql-test/suite/galera/t/MW-416.test
+++ b/mysql-test/suite/galera/t/MW-416.test
@@ -17,87 +17,87 @@ ALTER DATABASE db CHARACTER SET = utf8;
 ALTER EVENT ev1 RENAME TO ev2;
 --error 1370
 ALTER FUNCTION fun1 COMMENT 'foo';
-#--error 1044,1142,1227,1370
+#--error 1044,1227
 #ALTER INSTANCE ROTATE INNODB MASTER KEY;
---error 1044,1142,1227,1370
+--error 1044,1227
 ALTER LOGFILE GROUP lfg ADD UNDOFILE 'file' ENGINE=InnoDB;
---error 1044,1142,1227,1370
+--error 1044,1227,1370
 ALTER PROCEDURE proc1 COMMENT 'foo';
---error 1044,1142,1227,1370
+--error 1044,1227
 ALTER SERVER srv OPTIONS (USER 'sally');
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 ALTER TABLE tbl DROP COLUMN col;
---error 1044,1142,1227,1370
+--error 1044,1227
 ALTER TABLESPACE tblspc DROP DATAFILE 'file' ENGINE=innodb;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 ALTER VIEW vw AS SELECT 1;
 
---error 1044,1142,1227,1370
+--error 1044,1227
 CREATE DATABASE db;
---error 1044,1142,1227,1370
-CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP  DO SELECT 1;
---error 1044,1142,1227,1370
+--error 1044,1227
+CREATE EVENT ev1 ON SCHEDULE AT CURRENT_TIMESTAMP DO SELECT 1;
+--error 1044,1227,1370
 CREATE FUNCTION fun1() RETURNS int RETURN(1);
---error 1044,1142,1227,1370
+--error 1044,1227,1370
 CREATE FUNCTION fun1 RETURNS STRING SONAME 'funlib.so';
---error 1044,1142,1227,1370
-CREATE PROCEDURE proc1()  BEGIN END;
---error 1044,1142,1227,1370
+--error 1044,1227,1370
+CREATE PROCEDURE proc1() BEGIN END;
+--error 1044,1142,1227
 CREATE INDEX idx ON tbl(id);
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 CREATE LOGFILE GROUP lfg ADD UNDOFILE 'undofile' ENGINE innodb;
---error 1044,1142,1227,1370
+--error 1044,1227
 CREATE SERVER srv FOREIGN DATA WRAPPER 'fdw' OPTIONS (USER 'user');
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 CREATE TABLE t (i int);
---error 1044,1142,1227,1370
+--error 1044,1227
 CREATE TABLESPACE tblspc ADD DATAFILE 'file' ENGINE=innodb;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 CREATE TRIGGER trg BEFORE UPDATE ON t FOR EACH ROW BEGIN END;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 CREATE VIEW vw AS SELECT 1;
 
---error 1044,1142,1227,1370
+--error 1044,1227
 DROP DATABASE db;
---error 1044,1142,1227,1370
+--error 1044,1227
 DROP EVENT ev;
---error 1044,1142,1227,1370
+--error 1044,1227,1370
 DROP FUNCTION fun1;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 DROP INDEX idx ON t0;
---error 1044,1142,1227,1370,1064
+--error 1044,1227,1064
 DROP LOGFILE GROUP lfg;
---error 1044,1142,1227,1370
+--error 1044,1227,1370
 DROP PROCEDURE proc1;
---error 1044,1142,1227,1370
+--error 1044,1227
 DROP SERVEr srv;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 DROP TABLE t0;
---error 1044,1142,1227,1370,1064
+--error 1044,1227,1064
 DROP TABLESPACE tblspc;
---error 1044,1142,1227,1360,1370
+--error 1044,1227,1360
 DROP TRIGGER trg;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 DROP VIEW vw;
 
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 RENAME TABLE t0 TO t1;
 
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 TRUNCATE TABLE t0;
 
 # DCL
 
 # account management
---error 1044,1142,1227,1370,1064
+--error 1044,1227,1064
 ALTER USER myuser PASSWORD EXPIRE;
---error 1044,1142,1227,1370
+--error 1044,1227
 CREATE USER myuser IDENTIFIED BY 'pass';
---error 1044,1142,1227,1370
+--error 1044,1227
 DROP USER myuser;
---error 1044,1045,1142,1227,1370
+--error 1044,1045,1227
 GRANT ALL ON *.* TO 'myuser';
---error 1044,1142,1227,1370
+--error 1044,1227
 RENAME USER myuser TO mariauser;
 --error 1044,1142,1227,1370
 REVOKE SELECT ON test FROM myuser;
@@ -107,23 +107,25 @@ REVOKE ALL, GRANT OPTION FROM myuser;
 REVOKE PROXY ON myuser FROM myuser;
 
 # table maintenance
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 ANALYZE TABLE db.tbl;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 CHECK TABLE db.tbl;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 CHECKSUM TABLE db.tbl;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 OPTIMIZE TABLE db.tbl;
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 REPAIR TABLE db.tbl;
 
 # plugin and user defined functions
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 INSTALL PLUGIN plg SONAME 'plg.so';
---error 1044,1142,1227,1370
+--error 1044,1142,1227
 UNINSTALL PLUGIN plg;
 
 --connection node_1
 DROP USER 'userMW416'@'localhost';
 SHOW DATABASES;
+
+--disconnect userMW416
diff --git a/mysql-test/suite/galera_3nodes/r/galera-features#115.result b/mysql-test/suite/galera_3nodes/r/galera-features#115.result
new file mode 100644
index 00000000000..db965599d80
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/r/galera-features#115.result
@@ -0,0 +1,41 @@
+connection node_2;
+connection node_1;
+connection node_1;
+connection node_2;
+connection node_3;
+connection node_2;
+SET GLOBAL wsrep_on=OFF;
+DROP SCHEMA test;
+connection node_3;
+SET GLOBAL wsrep_on=OFF;
+CREATE TABLE t1 (f1 INTEGER);
+connection node_1;
+CREATE TABLE t1 (f1 INTEGER);
+connection node_1;
+SET SESSION wsrep_sync_wait=0;
+connection node_2;
+SET SESSION wsrep_sync_wait=0;
+connection node_3;
+SET SESSION wsrep_sync_wait=0;
+connection node_1;
+SET GLOBAL wsrep_provider_options='pc.bootstrap=YES';
+connection node_2;
+disconnect node_2;
+connect node_2, 127.0.0.1, root, , mysql, $NODE_MYPORT_2;
+# restart
+connection node_3;
+# restart
+connection node_1;
+DROP TABLE test.t1;
+connection node_2;
+CALL mtr.add_suppression("Inconsistent by consensus\\.");
+CALL mtr.add_suppression("Error_code: 1049");
+CALL mtr.add_suppression("WSREP: Failed to apply trx: source: ");
+CALL mtr.add_suppression("WSREP: Failed to apply app buffer");
+CALL mtr.add_suppression("WSREP: Node consistency compromized, leaving cluster\\.\\.\\.");
+connection node_3;
+CALL mtr.add_suppression("Inconsistent by consensus\\.");
+CALL mtr.add_suppression("Error_code: 1050");
+CALL mtr.add_suppression("WSREP: Failed to apply trx: source: ");
+CALL mtr.add_suppression("WSREP: Failed to apply app buffer");
+CALL mtr.add_suppression("WSREP: Node consistency compromized, leaving cluster\\.\\.\\.");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
index bdd18ee2534..0a2be393d27 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
@@ -3,7 +3,6 @@ connection node_1;
 connect node_5, 127.0.0.1, root, , test, $NODE_MYPORT_5;
 connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4;
 connection node_4;
-CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos;;
 START SLAVE;
 include/wait_for_slave_to_start.inc
 connection node_1;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result b/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
index 1cb14cd3eff..f4929a22a06 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
@@ -35,7 +35,7 @@ SHOW STATUS LIKE 'wsrep_cluster_size';
 Variable_name	Value
 wsrep_cluster_size	3
 connection node_1;
-change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_4, master_use_gtid=current_pos, ignore_server_ids=(12,13);;
+--- ignore_server_ids=(12,13)
 start slave;
 include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
@@ -45,7 +45,7 @@ select @@gtid_slave_pos;
 @@gtid_slave_pos
 
 connection node_4;
-change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos, ignore_server_ids=(22,23);;
+--- ignore_server_ids=(22,23)
 start slave;
 include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
@@ -258,7 +258,7 @@ set global wsrep_on=OFF;
 reset master;
 set global wsrep_on=ON;
 connection node_1;
-change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_6, master_use_gtid=current_pos, ignore_server_ids=(12,13);;
+--- ignore_server_ids=(12,13)
 start slave;
 include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
@@ -268,7 +268,7 @@ select @@gtid_slave_pos;
 @@gtid_slave_pos
 
 connection node_4;
-change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_3, master_use_gtid=current_pos, ignore_server_ids=(22,23);;
+--- ignore_server_ids=(22,23)
 start slave;
 include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
diff --git a/mysql-test/suite/galera_3nodes/suite.pm b/mysql-test/suite/galera_3nodes/suite.pm
index 49b93248a58..ff1ba0a566f 100644
--- a/mysql-test/suite/galera_3nodes/suite.pm
+++ b/mysql-test/suite/galera_3nodes/suite.pm
@@ -9,20 +9,20 @@ return wsrep_not_ok() if wsrep_not_ok();
 
 push @::global_suppressions,
   (
-     qr(WSREP: wsrep_sst_receive_address is set to '127.0.0.1),
+     qr(WSREP: wsrep_sst_receive_address is set to '127\.0\.0\.1),
      qr(WSREP: Could not open saved state file for reading: .*),
      qr(WSREP: Could not open state file for reading: .*),
-     qr(WSREP: Gap in state sequence. Need state transfer.),
+     qr(WSREP: Gap in state sequence\. Need state transfer\.),
      qr(WSREP: Failed to prepare for incremental state transfer:),
-     qr(WSREP:.*down context.*),
+     qr(WSREP: .*down context.*),
      qr(WSREP: Failed to send state UUID:),
      qr(WSREP: last inactive check more than .* skipping check),
-     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned.),
+     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned\.),
      qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
      qr(WSREP: Quorum: No node with complete state),
      qr(WSREP: Initial position was provided by configuration or SST, avoiding override),
      qr|WSREP: discarding established \(time wait\) .*|,
-     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside. Will use that one.),
+     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside\. Will use that one\.),
      qr(WSREP: evs::proto.*),
      qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|,
      qr(WSREP: no nodes coming from prim view, prim not possible),
@@ -45,33 +45,35 @@ push @::global_suppressions,
      qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
      qr(WSREP: gcs connect failed: Connection timed out),
      qr|WSREP: wsrep::connect\(.*\) failed: 7|,
-     qr(WSREP: SYNC message from member .* in non-primary configuration. Ignored.),
+     qr(WSREP: SYNC message from member .* in non-primary configuration\. Ignored\.),
      qr(WSREP: Could not find peer:),
      qr(WSREP: TO isolation failed for: .*),
      qr|WSREP: gcs_caused\(\) returned .*|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored.|,
-     qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled. Expect abort.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored\.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored\.|,
+     qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled\. Expect abort\.|,
      qr(WSREP: Action message in non-primary configuration from member [0-9]*),
      qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*),
      qr(WSREP: discarding established .*),
      qr|WSREP: .*core_handle_uuid_msg.*|,
-     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0. WSREP_SYNC_WAIT_BEFORE_READ is on),
-     qr|WSREP: JOIN message from member .* in non-primary configuration. Ignored.|,
-     qr|Query apply failed:*|,
-     qr(WSREP: Ignoring error*),
+     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0\. WSREP_SYNC_WAIT_BEFORE_READ is on),
+     qr|WSREP: JOIN message from member .* in non-primary configuration\. Ignored\.|,
+     qr|WSREP: .*Query apply failed:.*|,
+     qr(WSREP: Ignoring error.*),
      qr(WSREP: Failed to remove page file .*),
      qr(WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*),
-     qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\). Will retry in new primary component.|,
+     qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.|,
+     qr|WSREP: Send action \{.* STATE_REQUEST\} returned -107 \(Transport endpoint is not connected\)|,
      qr|WSREP: Trying to continue unpaused monitor|,
      qr|WSREP: Wait for gtid returned error 3 while waiting for prior transactions to commit before setting position|,
+     qr|WSREP: Failed to report last committed|,
    );
 
 sub which($) { return `sh -c "command -v $_[0]"` }
 
 sub skip_combinations {
   my %skip = ();
-  $skip{'include/have_mariabackup.inc'} = 'Need ss'
+  $skip{'include/have_mariabackup.inc'} = 'Need socket statistics utility'
             unless which("lsof") || which("sockstat") || which("ss");
   %skip;
 }
diff --git a/mysql-test/suite/galera_3nodes/t/galera-features#115.cnf b/mysql-test/suite/galera_3nodes/t/galera-features#115.cnf
new file mode 100644
index 00000000000..e255e1d527e
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/t/galera-features#115.cnf
@@ -0,0 +1,4 @@
+!include ../galera_3nodes.cnf
+
+[mysqld]
+wsrep-ignore-apply-errors=0
diff --git a/mysql-test/suite/galera_3nodes/t/galera-features#115.test b/mysql-test/suite/galera_3nodes/t/galera-features#115.test
new file mode 100644
index 00000000000..f045e7abe4b
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/t/galera-features#115.test
@@ -0,0 +1,89 @@
+#
+# This test tests that one successful node wins over two nodes that fail for
+# different reasons
+#
+--source include/galera_cluster.inc
+--source include/have_innodb.inc
+
+--let $galera_connection_name = node_3
+--let $galera_server_number = 3
+--source include/galera_connect.inc
+
+--let $node_1=node_1
+--let $node_2=node_2
+--let $node_3=node_3
+--source suite/galera/include/auto_increment_offset_save.inc
+
+# create inconsistency on node 2
+--connection node_2
+SET GLOBAL wsrep_on=OFF;
+DROP SCHEMA test;
+
+# create inconsistency on node 3
+--connection node_3
+SET GLOBAL wsrep_on=OFF;
+CREATE TABLE t1 (f1 INTEGER);
+
+--connection node_1
+CREATE TABLE t1 (f1 INTEGER);
+
+# check that nodes 2 and 3 leave the cluster, and node_1 is Primary by itself
+
+--connection node_1
+SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--source include/wait_condition.inc
+
+--connection node_2
+SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Disconnected' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+
+--connection node_3
+SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Disconnected' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+
+--connection node_1
+# this is a workaround for "sending install message failed" BUG:
+# https://github.com/codership/galera/issues/174
+# When it happens, node_1 becomes non-prim
+SET GLOBAL wsrep_provider_options='pc.bootstrap=YES';
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+
+# restart nodes 2 and 3, since they failed
+
+--connection node_2
+# need to reinitialize connection due to a "Bad handshake" bug.
+# we reconnect using the 'mysql' database as 'test' was dropped.
+--disconnect node_2
+--connect node_2, 127.0.0.1, root, , mysql, $NODE_MYPORT_2
+ --source include/restart_mysqld.inc
+
+--connection node_3
+ --source include/restart_mysqld.inc
+
+--connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--source include/wait_condition.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+
+DROP TABLE test.t1;
+
+--source suite/galera/include/auto_increment_offset_restore.inc
+
+--connection node_2
+CALL mtr.add_suppression("Inconsistent by consensus\\.");
+CALL mtr.add_suppression("Error_code: 1049");
+CALL mtr.add_suppression("WSREP: Failed to apply trx: source: ");
+CALL mtr.add_suppression("WSREP: Failed to apply app buffer");
+CALL mtr.add_suppression("WSREP: Node consistency compromized, leaving cluster\\.\\.\\.");
+
+--connection node_3
+CALL mtr.add_suppression("Inconsistent by consensus\\.");
+CALL mtr.add_suppression("Error_code: 1050");
+CALL mtr.add_suppression("WSREP: Failed to apply trx: source: ");
+CALL mtr.add_suppression("WSREP: Failed to apply app buffer");
+CALL mtr.add_suppression("WSREP: Node consistency compromized, leaving cluster\\.\\.\\.");
diff --git a/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test b/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
index e59fcfb2100..86119bf7bcb 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
@@ -15,8 +15,9 @@
 
 --connection node_4
 
---replace_result $NODE_MYPORT_1 NODE_MYPORT_1
+--disable_query_log
 --eval CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$NODE_MYPORT_1, master_use_gtid=current_pos;
+--enable_query_log
 START SLAVE;
 --source include/wait_for_slave_to_start.inc
 
diff --git a/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test b/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
index c8247f15aba..750f840c470 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
@@ -42,8 +42,10 @@ SHOW STATUS LIKE 'wsrep_cluster_size';
 SHOW STATUS LIKE 'wsrep_cluster_size';
 #--disable_parsing
 --connection node_1
---replace_result $NODE_MYPORT_4 NODE_MYPORT_4
+--echo --- ignore_server_ids=(12,13)
+--disable_query_log
 --eval change master to master_host='127.0.0.1', master_user='root', master_port=$NODE_MYPORT_4, master_use_gtid=current_pos, ignore_server_ids=(12,13);
+--enable_query_log
 start slave;
 --source include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
@@ -51,8 +53,10 @@ select @@gtid_slave_pos;
 #--query_vertical SHOW SLAVE STATUS;
 
 --connection node_4
---replace_result $NODE_MYPORT_1 NODE_MYPORT_1
+--echo --- ignore_server_ids=(22,23)
+--disable_query_log
 --eval change master to master_host='127.0.0.1', master_user='root', master_port=$NODE_MYPORT_1, master_use_gtid=current_pos, ignore_server_ids=(22,23);
+--enable_query_log
 start slave;
 --source include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
@@ -210,8 +214,10 @@ set global wsrep_on=ON;
 # Then we will kill node D and set up the replication between A and E
 # To see whether fail over works or not.
 --connection node_1
---replace_result $NODE_MYPORT_6 NODE_MYPORT_6
+--echo --- ignore_server_ids=(12,13)
+--disable_query_log
 --eval change master to master_host='127.0.0.1', master_user='root', master_port=$NODE_MYPORT_6, master_use_gtid=current_pos, ignore_server_ids=(12,13);
+--enable_query_log
 start slave;
 --source include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
@@ -219,8 +225,10 @@ select @@gtid_slave_pos;
 #--query_vertical SHOW SLAVE STATUS;
 
 --connection node_4
---replace_result $NODE_MYPORT_3 NODE_MYPORT_3
+--echo --- ignore_server_ids=(22,23)
+--disable_query_log
 --eval change master to master_host='127.0.0.1', master_user='root', master_port=$NODE_MYPORT_3, master_use_gtid=current_pos, ignore_server_ids=(22,23);
+--enable_query_log
 start slave;
 --source include/wait_for_slave_to_start.inc
 select @@gtid_binlog_state;
diff --git a/mysql-test/suite/galera_3nodes_sr/suite.pm b/mysql-test/suite/galera_3nodes_sr/suite.pm
index becc764733a..d2b31a0fbc7 100644
--- a/mysql-test/suite/galera_3nodes_sr/suite.pm
+++ b/mysql-test/suite/galera_3nodes_sr/suite.pm
@@ -9,21 +9,21 @@ return wsrep_not_ok() if wsrep_not_ok();
 
 push @::global_suppressions,
   (
-     qr(WSREP: wsrep_sst_receive_address is set to '127.0.0.1),
+     qr(WSREP: wsrep_sst_receive_address is set to '127\.0\.0\.1),
      qr(WSREP: Could not open saved state file for reading: .*),
      qr(WSREP: Could not open state file for reading: .*),
-     qr(WSREP: Gap in state sequence. Need state transfer.),
+     qr(WSREP: Gap in state sequence. Need state transfer\.),
      qr(WSREP: Failed to prepare for incremental state transfer:),
-     qr(WSREP:.*down context.*),
+     qr(WSREP: .*down context.*),
      qr(WSREP: Failed to send state UUID:),
      qr(WSREP: last inactive check more than .* skipping check),
      qr(WSREP: SQL statement was ineffective),
-     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned.),
+     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned\.),
      qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
      qr(WSREP: Quorum: No node with complete state),
      qr(WSREP: Initial position was provided by configuration or SST, avoiding override),
-     qr|WSREP: discarding established \(time wait\) .*|,
-     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside. Will use that one.),
+     qr|WSREP: discarding established \(time wait\).*|,
+     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside\. Will use that one\.),
      qr(WSREP: evs::proto.*),
      qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|,
      qr(WSREP: no nodes coming from prim view, prim not possible),
@@ -31,16 +31,16 @@ push @::global_suppressions,
      qr(WSREP: user message in state LEAVING),
      qr(WSREP: .* sending install message failed: Transport endpoint is not connected),
      qr(WSREP: .* sending install message failed: Resource temporarily unavailable),
-     qr(WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\). Will retry in new primary component.),
+     qr(WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.),
      qr(WSREP: Could not find peer:),
      qr|WSREP: gcs_caused\(\) returned .*|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(SYNCED\)\. Message ignored\.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(JOINED\)\. Message ignored\.|,
      qr(WSREP: Action message in non-primary configuration from member [0-9]*),
      qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*),
      qr|WSREP: .*core_handle_uuid_msg.*|,
-     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0. WSREP_SYNC_WAIT_BEFORE_READ is on),
-     qr(WSREP: JOIN message from member .* in non-primary configuration. Ignored.),
+     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0\. WSREP_SYNC_WAIT_BEFORE_READ is on),
+     qr(WSREP: JOIN message from member .* in non-primary configuration\. Ignored\.),
    );
 
 bless { };
diff --git a/mysql-test/suite/galera_sr/suite.pm b/mysql-test/suite/galera_sr/suite.pm
index a9665b5252c..1a0e9b28685 100644
--- a/mysql-test/suite/galera_sr/suite.pm
+++ b/mysql-test/suite/galera_sr/suite.pm
@@ -9,20 +9,20 @@ return wsrep_not_ok() if wsrep_not_ok();
 
 push @::global_suppressions,
   (
-     qr(WSREP: wsrep_sst_receive_address is set to '127.0.0.1),
+     qr(WSREP: wsrep_sst_receive_address is set to '127\.0\.0\.1),
      qr(WSREP: Could not open saved state file for reading: .*),
      qr(WSREP: Could not open state file for reading: .*),
-     qr(WSREP: Gap in state sequence. Need state transfer.),
+     qr(WSREP: Gap in state sequence\. Need state transfer\.),
      qr(WSREP: Failed to prepare for incremental state transfer:),
-     qr(WSREP:.*down context.*),
+     qr(WSREP: .*down context.*),
      qr(WSREP: Failed to send state UUID:),
      qr(WSREP: last inactive check more than .* skipping check),
-     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned.),
+     qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned\.),
      qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
      qr(WSREP: Quorum: No node with complete state),
      qr(WSREP: Initial position was provided by configuration or SST, avoiding override),
      qr|WSREP: discarding established \(time wait\) .*|,
-     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside. Will use that one.),
+     qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside\. Will use that one\.),
      qr(WSREP: evs::proto.*),
      qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|,
      qr(WSREP: no nodes coming from prim view, prim not possible),
@@ -45,26 +45,28 @@ push @::global_suppressions,
      qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
      qr(WSREP: gcs connect failed: Connection timed out),
      qr|WSREP: wsrep::connect\(.*\) failed: 7|,
-     qr(WSREP: SYNC message from member .* in non-primary configuration. Ignored.),
+     qr(WSREP: SYNC message from member .* in non-primary configuration\. Ignored\.),
      qr(WSREP: Could not find peer:),
      qr(WSREP: TO isolation failed for: .*),
      qr|WSREP: gcs_caused\(\) returned .*|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored.|,
-     qr|WSREP: Protocol violation. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored.|,
-     qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled. Expect abort.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(SYNCED\). Message ignored\.|,
+     qr|WSREP: Protocol violation\. JOIN message sender .* is not in state transfer \(JOINED\). Message ignored\.|,
+     qr|WSREP: Unsupported protocol downgrade: incremental data collection disabled\. Expect abort\.|,
      qr(WSREP: Action message in non-primary configuration from member [0-9]*),
      qr(WSREP: Last Applied Action message in non-primary configuration from member [0-9]*),
      qr(WSREP: discarding established .*),
      qr|WSREP: .*core_handle_uuid_msg.*|,
-     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0. WSREP_SYNC_WAIT_BEFORE_READ is on),
-     qr|WSREP: JOIN message from member .* in non-primary configuration. Ignored.|,
-     qr|Query apply failed:*|,
-     qr(WSREP: Ignoring error*),
+     qr(WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0\. WSREP_SYNC_WAIT_BEFORE_READ is on),
+     qr|WSREP: JOIN message from member .* in non-primary configuration\. Ignored\.|,
+     qr|WSREP: .*Query apply failed:.*|,
+     qr(WSREP: Ignoring error.*),
      qr(WSREP: Failed to remove page file .*),
      qr(WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*),
-     qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\). Will retry in new primary component.|,
+     qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.|,
+     qr|WSREP: Send action \{.* STATE_REQUEST\} returned -107 \(Transport endpoint is not connected\)|,
      qr|WSREP: Trying to continue unpaused monitor|,
      qr|WSREP: Wait for gtid returned error 3 while waiting for prior transactions to commit before setting position|,
+     qr|WSREP: Failed to report last committed|,
    );
 
 bless { };