From 04d731b6cc93b3957a3dc6ccdd5b57db29828a82 Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Wed, 19 Feb 2025 03:53:49 +0100
Subject: [PATCH] galera mtr tests: synchronization between versions

Added fixes to galera tests for issues found during
merging changes from 10.5 to 10.6.
---
 .../galera/r/galera_as_slave_nonprim.result      |  2 +-
 .../r/galera_sst_mariabackup_gtid,debug.rdiff    |  4 ++--
 .../galera/r/galera_sst_rsync_gtid,debug.rdiff   |  4 ++--
 mysql-test/suite/galera/suite.pm                 | 16 ++++++++--------
 .../suite/galera/t/galera_as_slave_nonprim.test  |  2 +-
 .../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_weight.result      | 10 +++++-----
 mysql-test/suite/galera_3nodes/suite.pm          | 16 ++++++++--------
 .../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 ++++----
 .../suite/galera_3nodes/t/galera_pc_weight.test  | 10 +++++-----
 mysql-test/suite/galera_3nodes_sr/suite.pm       | 11 ++++++-----
 mysql-test/suite/galera_sr/suite.pm              | 16 ++++++++--------
 .../suite/wsrep/t/wsrep_mixed_case_cmd_arg.cnf   |  1 -
 17 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_as_slave_nonprim.result b/mysql-test/suite/galera/r/galera_as_slave_nonprim.result
index fefc988d9d4..969e844577e 100644
--- a/mysql-test/suite/galera/r/galera_as_slave_nonprim.result
+++ b/mysql-test/suite/galera/r/galera_as_slave_nonprim.result
@@ -27,7 +27,7 @@ STOP SLAVE;
 RESET SLAVE ALL;
 CALL mtr.add_suppression("Slave SQL: Error 'Unknown command' on query");
 CALL mtr.add_suppression("Slave: Unknown command Error_code: 1047");
-CALL mtr.add_suppression("Transport endpoint is not connected");
+CALL mtr.add_suppression("(Transport endpoint|Socket) is not connected");
 CALL mtr.add_suppression("Slave SQL: Error in Xid_log_event: Commit could not be completed, 'Deadlock found when trying to get lock; try restarting transaction', Error_code: 1213");
 CALL mtr.add_suppression("Slave SQL: Node has dropped from cluster, Error_code: 1047");
 connection node_4;
diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup_gtid,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_mariabackup_gtid,debug.rdiff
index 12609bb571f..4e1470839e9 100644
--- a/mysql-test/suite/galera/r/galera_sst_mariabackup_gtid,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_mariabackup_gtid,debug.rdiff
@@ -1,5 +1,5 @@
---- suite/galera/r/galera_sst_mariabackup_gtid.result	2025-01-02 15:34:28.251593452 +0200
-+++ suite/galera/r/galera_sst_mariabackup_gtid.reject	2025-01-02 16:01:18.058469177 +0200
+--- r/galera_sst_mariabackup_gtid.result
++++ r/galera_sst_mariabackup_gtid,debug.reject
 @@ -516,19 +516,203 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_sst_rsync_gtid,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_rsync_gtid,debug.rdiff
index 0e3e85ef213..c83ead475e2 100644
--- a/mysql-test/suite/galera/r/galera_sst_rsync_gtid,debug.rdiff
+++ b/mysql-test/suite/galera/r/galera_sst_rsync_gtid,debug.rdiff
@@ -1,5 +1,5 @@
---- suite/galera/r/galera_sst_rsync_gtid.result	2025-01-02 15:35:15.162175835 +0200
-+++ suite/galera/r/galera_sst_rsync_gtid.reject	2025-01-02 16:02:08.588902711 +0200
+--- r/galera_sst_rsync_gtid.result
++++ r/galera_sst_rsync_gtid,debug.reject
 @@ -516,19 +516,203 @@
  1
  DROP TABLE t1;
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 8f2a0cf5385..55cdde373c5 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -17,7 +17,7 @@ push @::global_suppressions,
      qr(WSREP: Failed to prepare for incremental state transfer:),
      qr(WSREP: .*down context.*),
      qr(WSREP: Failed to send state UUID:),
-     qr(WSREP: last inactive check more than .* skipping check),
+     qr(WSREP: last inactive check more than .+ skipping check),
      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),
@@ -27,7 +27,7 @@ push @::global_suppressions,
      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),
-     qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable),
+     qr(WSREP: Member .+ ?requested state transfer from .+ but it is impossible to select State Transfer donor: Resource temporarily unavailable),
      qr(WSREP: user message in state LEAVING),
      qr(WSREP: .* sending install message failed: (Transport endpoint|Socket) is not connected),
      qr(WSREP: .* sending install message failed: Resource temporarily unavailable),
@@ -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: 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|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|Socket) is not connected\)\. Will retry in new primary component\.+,
+     qr+WSREP: Send action \{.* STATE_REQUEST\} returned -107 \((Transport endpoint|Socket) 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/galera_as_slave_nonprim.test b/mysql-test/suite/galera/t/galera_as_slave_nonprim.test
index 600d64e5a81..42414761e62 100644
--- a/mysql-test/suite/galera/t/galera_as_slave_nonprim.test
+++ b/mysql-test/suite/galera/t/galera_as_slave_nonprim.test
@@ -84,7 +84,7 @@ RESET SLAVE ALL;
 
 CALL mtr.add_suppression("Slave SQL: Error 'Unknown command' on query");
 CALL mtr.add_suppression("Slave: Unknown command Error_code: 1047");
-CALL mtr.add_suppression("Transport endpoint is not connected");
+CALL mtr.add_suppression("(Transport endpoint|Socket) is not connected");
 CALL mtr.add_suppression("Slave SQL: Error in Xid_log_event: Commit could not be completed, 'Deadlock found when trying to get lock; try restarting transaction', Error_code: 1213");
 CALL mtr.add_suppression("Slave SQL: Node has dropped from cluster, Error_code: 1047");
 
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 fdea4154626..52f5db8daed 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 7811059db42..a63e7933e9c 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 ea185bf676a..d80d90cd726 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|Socket) 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_weight.result b/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result
index 6d8c7a51b1f..9351d528b87 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result
@@ -157,10 +157,10 @@ SET GLOBAL wsrep_provider_options = 'pc.weight=1';
 CALL mtr.add_suppression('WSREP: gcs_caused\\(\\) returned -1');
 connection node_2;
 CALL mtr.add_suppression('SYNC message from member');
-CALL mtr.add_suppression('user message in state LEAVING');
-CALL mtr.add_suppression('sending install message failed: (Transport endpoint is not connected|Socket is not connected)');
-CALL mtr.add_suppression('overriding reported weight for');
+CALL mtr.add_suppression('WSREP: user message in state LEAVING');
+CALL mtr.add_suppression('sending install message failed: (Transport endpoint|Socket) is not connected');
+CALL mtr.add_suppression('overriding reported weight for ');
 connection node_3;
 CALL mtr.add_suppression('WSREP: user message in state LEAVING');
-CALL mtr.add_suppression('sending install message failed: (Transport endpoint is not connected|Socket is not connected)');
-CALL mtr.add_suppression('overriding reported weight for');
+CALL mtr.add_suppression('sending install message failed: (Transport endpoint|Socket) is not connected');
+CALL mtr.add_suppression('overriding reported weight for ');
diff --git a/mysql-test/suite/galera_3nodes/suite.pm b/mysql-test/suite/galera_3nodes/suite.pm
index c1cc1ef4076..34b5afd0cdc 100644
--- a/mysql-test/suite/galera_3nodes/suite.pm
+++ b/mysql-test/suite/galera_3nodes/suite.pm
@@ -16,7 +16,7 @@ push @::global_suppressions,
      qr(WSREP: Failed to prepare for incremental state transfer:),
      qr(WSREP: .*down context.*),
      qr(WSREP: Failed to send state UUID:),
-     qr(WSREP: last inactive check more than .* skipping check),
+     qr(WSREP: last inactive check more than .+ skipping check),
      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),
@@ -26,7 +26,7 @@ push @::global_suppressions,
      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),
-     qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable),
+     qr(WSREP: Member .+ ?requested state transfer from .+ but it is impossible to select State Transfer donor: Resource temporarily unavailable),
      qr(WSREP: user message in state LEAVING),
      qr(WSREP: .* sending install message failed: (Transport endpoint|Socket) is not connected),
      qr(WSREP: .* sending install message failed: Resource temporarily unavailable),
@@ -45,25 +45,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: 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|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|Socket) is not connected\)\. Will retry in new primary component\.+,
+     qr+WSREP: Send action \{.* STATE_REQUEST\} returned -107 \((Transport endpoint|Socket) 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_3nodes/t/galera_join_with_cc_A.test b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_A.test
index bb25b1dd9d1..b30446b84bb 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 b5983c384ed..b80a1dd89fb 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 d914482a100..6afd7b94d0f 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|Socket) 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_weight.test b/mysql-test/suite/galera_3nodes/t/galera_pc_weight.test
index 8a1c93a769f..037a732923f 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_pc_weight.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_pc_weight.test
@@ -132,11 +132,11 @@ CALL mtr.add_suppression('WSREP: gcs_caused\\(\\) returned -1');
 
 --connection node_2
 CALL mtr.add_suppression('SYNC message from member');
-CALL mtr.add_suppression('user message in state LEAVING');
-CALL mtr.add_suppression('sending install message failed: (Transport endpoint is not connected|Socket is not connected)');
-CALL mtr.add_suppression('overriding reported weight for');
+CALL mtr.add_suppression('WSREP: user message in state LEAVING');
+CALL mtr.add_suppression('sending install message failed: (Transport endpoint|Socket) is not connected');
+CALL mtr.add_suppression('overriding reported weight for ');
 
 --connection node_3
 CALL mtr.add_suppression('WSREP: user message in state LEAVING');
-CALL mtr.add_suppression('sending install message failed: (Transport endpoint is not connected|Socket is not connected)');
-CALL mtr.add_suppression('overriding reported weight for');
+CALL mtr.add_suppression('sending install message failed: (Transport endpoint|Socket) is not connected');
+CALL mtr.add_suppression('overriding reported weight for ');
diff --git a/mysql-test/suite/galera_3nodes_sr/suite.pm b/mysql-test/suite/galera_3nodes_sr/suite.pm
index 54489387ec5..c7f4472e242 100644
--- a/mysql-test/suite/galera_3nodes_sr/suite.pm
+++ b/mysql-test/suite/galera_3nodes_sr/suite.pm
@@ -27,20 +27,21 @@ push @::global_suppressions,
      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),
-     qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable),
+     qr(WSREP: Member .+ ?requested state transfer from .+ but it is impossible to select State Transfer donor: Resource temporarily unavailable),
      qr(WSREP: user message in state LEAVING),
      qr(WSREP: .* sending install message failed: (Transport endpoint|Socket) is not connected),
      qr(WSREP: .* sending install message failed: Resource temporarily unavailable),
      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: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.|,
+     qr|WSREP: JOIN message from member .+ ?in non-primary configuration\. Ignored\.|,
+     qr+WSREP: Sending JOIN failed: -107 \((Transport endpoint|Socket) is not connected\)\. Will retry in new primary component\.+,
+     qr+WSREP: Send action \{.* STATE_REQUEST\} returned -107 \((Transport endpoint|Socket) is not connected\)+,
    );
 
 bless { };
diff --git a/mysql-test/suite/galera_sr/suite.pm b/mysql-test/suite/galera_sr/suite.pm
index a0e386a52b7..0aea25145da 100644
--- a/mysql-test/suite/galera_sr/suite.pm
+++ b/mysql-test/suite/galera_sr/suite.pm
@@ -16,7 +16,7 @@ push @::global_suppressions,
      qr(WSREP: Failed to prepare for incremental state transfer:),
      qr(WSREP: .*down context.*),
      qr(WSREP: Failed to send state UUID:),
-     qr(WSREP: last inactive check more than .* skipping check),
+     qr(WSREP: last inactive check more than .+ skipping check),
      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),
@@ -26,7 +26,7 @@ push @::global_suppressions,
      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),
-     qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable),
+     qr(WSREP: Member .+ ?requested state transfer from .+ but it is impossible to select State Transfer donor: Resource temporarily unavailable),
      qr(WSREP: user message in state LEAVING),
      qr(WSREP: .* sending install message failed: (Transport endpoint|Socket) is not connected),
      qr(WSREP: .* sending install message failed: Resource temporarily unavailable),
@@ -45,25 +45,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: 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|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|Socket) is not connected\)\. Will retry in new primary component\.+,
+     qr+WSREP: Send action \{.* STATE_REQUEST\} returned -107 \((Transport endpoint|Socket) 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/wsrep/t/wsrep_mixed_case_cmd_arg.cnf b/mysql-test/suite/wsrep/t/wsrep_mixed_case_cmd_arg.cnf
index 0bf01f81fc5..c2b7c4d415f 100644
--- a/mysql-test/suite/wsrep/t/wsrep_mixed_case_cmd_arg.cnf
+++ b/mysql-test/suite/wsrep/t/wsrep_mixed_case_cmd_arg.cnf
@@ -4,4 +4,3 @@
 wsrep-on=ON
 wsrep-provider=@ENV.WSREP_PROVIDER
 wsrep-cluster-address=gcomm://
-