5 files changed, 20 insertions, 28 deletions
diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test
index dcf6bd154ce..6e2366e6212 100644
--- a/mysql-test/include/check-testcase.test
+++ b/mysql-test/include/check-testcase.test
@@ -1,3 +1,5 @@
+--source include/wait_until_ready.inc
+
 # ==== Purpose ====
 #
 # This test is executed twice for each test case. Before every
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 84f5823c5ef..9d97d23897c 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -227,27 +227,6 @@ INSERT INTO global_suppressions VALUES
  ("Slave I/O: Notifying master by SET @master_binlog_checksum= @@global.binlog_checksum failed with error.*"),
  ("Slave I/O: Setting master-side filtering of @@skip_replication failed with error:.*"),
  ("Slave I/O: Setting @mariadb_slave_capability failed with error:.*"),
-
- /*
-   Galera suppressions 
- */
- ("WSREP:*down context*"),
- ("WSREP: Failed to send state UUID:*"),
- ("WSREP: wsrep_sst_receive_address is set to '127.0.0.1"),
- ("WSREP: option --wsrep-casual-reads is deprecated"),
- ("WSREP: --wsrep-casual-reads=ON takes precedence over --wsrep-sync-wait=0"),
- ("WSREP: Could not open saved state file for reading: "),
- ("WSREP: access file\\(gvwstate\\.dat\\) failed\\(No such file or directory\\)"),
- ("WSREP: Gap in state sequence\\. Need state transfer\\."),
- ("WSREP: Failed to prepare for incremental state transfer: Local state UUID \\(00000000-0000-0000-0000-000000000000\\) does not match group state UUID"),
- ("WSREP: No existing UUID has been found, so we assume that this is the first time that this server has been started\\. Generating a new UUID: "),
- ("WSREP: last inactive check more than"),
- ("WSREP: binlog cache not empty \\(0 bytes\\) at connection close"),
- ("WSREP: Failed to guess base node address"),
- ("WSREP: Guessing address for incoming client connections failed"),
- ("WSREP: Failed to read output of: '/sbin/ifconfig"),
- ("WSREP: SQL statement was ineffective"),
-
  ("THE_LAST_SUPPRESSION")||
 
 
diff --git a/mysql-test/include/write_result_to_file.inc b/mysql-test/include/write_result_to_file.inc
index db5d546750c..3e2ddf48957 100644
--- a/mysql-test/include/write_result_to_file.inc
+++ b/mysql-test/include/write_result_to_file.inc
@@ -33,8 +33,7 @@
 --let _WRTF_SERVER_NUMBER= $server_number
 if (!$server_number)
 {
-  # Note: 2 extra ports are reserved per server for galera use.
-  --let _WRTF_SERVER_NUMBER= `SELECT 1 + FLOOR((@@PORT - $MASTER_MYPORT) / 3)`
+  --let _WRTF_SERVER_NUMBER= `SELECT 1 + @@PORT - $MASTER_MYPORT`
 }
 
 --let $_write_result_msg= [server=$_WRTF_SERVER_NUMBER]
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 0335e13f54a..e21207b659a 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -24,13 +24,16 @@ return "No my_print_defaults" unless $epath;
 
 push @::global_suppressions,
   (
+     qr(WSREP: Failed to guess base node address),
+     qr(WSREP: Guessing address for incoming client connections failed),
+     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: Gap in state sequence. Need state transfer.),
+     qr(WSREP: Failed to prepare for incremental state transfer:),
      qr(WSREP:.*down context.*),
-     qr(WSREP: Failed to send state UUID:.*),
-     qr(WSREP: wsrep_sst_receive_address.*),
-     qr(WSREP: Could not open saved state file for reading: .*),
+     qr(WSREP: Failed to send state UUID:),
      qr(WSREP: last inactive check more than .* skipping check),
-     qr(WSREP: Gap in state sequence. Need state transfer.),
-     qr(WSREP: Failed to prepare for incremental state transfer: .*),
+     qr(WSREP: SQL statement was ineffective),
    );
 
 
diff --git a/mysql-test/suite/wsrep/suite.pm b/mysql-test/suite/wsrep/suite.pm
index 369ebb0abeb..7b3b2db6836 100644
--- a/mysql-test/suite/wsrep/suite.pm
+++ b/mysql-test/suite/wsrep/suite.pm
@@ -22,6 +22,15 @@ return "No SST scripts" unless $spath;
 my ($epath) = grep { -f "$_/my_print_defaults"; } "$::bindir/extra", $::path_client_bindir;
 return "No my_print_defaults" unless $epath;
 
+push @::global_suppressions,
+  (
+     qr(WSREP: Failed to guess base node address),
+     qr(WSREP: Guessing address for incoming client connections failed),
+     qr(WSREP: Could not open saved state file for reading: ),
+     qr(WSREP: option --wsrep-casual-reads is deprecated),
+     qr(WSREP: --wsrep-casual-reads=ON takes precedence over --wsrep-sync-wait=0),
+   );
+
 $ENV{PATH}="$epath:$ENV{PATH}";
 $ENV{PATH}="$spath:$ENV{PATH}" unless $epath eq $spath;