From 7b040e53cc07bc7bd78d9c2029e1e714e19c2fec Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Thu, 6 Feb 2025 21:29:04 +0100
Subject: [PATCH] galera mtr tests: fixes for test failures, 'cosmetic' changes
 and unification between versions

---
 mysql-test/suite/galera/r/MDEV-20225.result   |  2 +-
 mysql-test/suite/galera/r/MDEV-20793.result   |  2 +-
 mysql-test/suite/galera/r/MDEV-25389.result   |  1 +
 .../r/galera_applier_ftwrl_table_alter.result |  4 +-
 .../galera/r/galera_ddl_fk_conflict.result    |  3 ++
 .../r/galera_parallel_apply_lock_table.result |  7 ++-
 .../galera/r/galera_parallel_simple.result    |  1 -
 .../galera/r/galera_var_slave_threads.result  |  1 -
 .../suite/galera/r/wsrep_strict_ddl.result    |  6 +--
 mysql-test/suite/galera/suite.pm              | 54 +++++++++----------
 mysql-test/suite/galera/t/MDEV-10715.cnf      |  4 +-
 mysql-test/suite/galera/t/MDEV-15443.cnf      |  2 +
 mysql-test/suite/galera/t/MDEV-20225.test     |  2 +-
 mysql-test/suite/galera/t/MDEV-20793.test     |  2 +-
 mysql-test/suite/galera/t/MDEV-22227.test     |  2 +-
 mysql-test/suite/galera/t/MDEV-22708.cnf      |  2 +-
 mysql-test/suite/galera/t/MDEV-24143.test     |  1 -
 mysql-test/suite/galera/t/MDEV-24327.cnf      |  1 -
 mysql-test/suite/galera/t/MDEV-25389.test     |  7 +++
 mysql-test/suite/galera/t/MDEV-25731.test     |  2 -
 mysql-test/suite/galera/t/MDEV-26597.test     |  2 -
 mysql-test/suite/galera/t/MDEV-27123.opt      |  1 -
 mysql-test/suite/galera/t/MDEV-29293.test     |  1 -
 mysql-test/suite/galera/t/MDEV-29512.cnf      |  2 -
 mysql-test/suite/galera/t/MDEV-6860.cnf       |  5 +-
 mysql-test/suite/galera/t/MW-259.test         |  1 -
 mysql-test/suite/galera/t/MW-313.cnf          |  3 --
 mysql-test/suite/galera/t/MW-360-master.opt   |  1 -
 mysql-test/suite/galera/t/MW-369.inc          |  2 -
 mysql-test/suite/galera/t/MW-86-wait8.cnf     |  1 -
 mysql-test/suite/galera/t/create.test         |  1 -
 .../suite/galera/t/galera_MDEV-29512.cnf      |  2 -
 .../galera/t/galera_applier_ftwrl_table.test  |  2 +-
 .../t/galera_applier_ftwrl_table_alter.cnf    |  3 --
 .../t/galera_applier_ftwrl_table_alter.test   |  6 +--
 .../suite/galera/t/galera_as_slave_ctas.test  |  1 -
 .../suite/galera/t/galera_backup_stage.test   |  6 +--
 .../t/galera_bf_abort_at_after_statement.test |  1 -
 .../t/galera_bf_abort_flush_for_export.test   |  4 +-
 .../galera/t/galera_bf_abort_lock_table.cnf   |  4 --
 .../galera/t/galera_bf_abort_lock_table.test  |  5 +-
 .../suite/galera/t/galera_bf_abort_ps.cnf     |  3 +-
 .../t/galera_bf_background_statistics.cnf     |  2 -
 .../t/galera_bf_background_statistics.test    |  1 -
 mysql-test/suite/galera/t/galera_bf_kill.test |  2 +-
 .../suite/galera/t/galera_bf_lock_wait.test   |  1 -
 .../suite/galera/t/galera_binlog_checksum.cnf |  2 -
 .../t/galera_binlog_event_max_size_max.cnf    |  3 --
 .../t/galera_binlog_event_max_size_min.cnf    |  3 --
 .../t/galera_binlog_event_max_size_min.test   |  1 -
 .../galera/t/galera_binlog_row_image.test     |  4 --
 .../suite/galera/t/galera_change_user.test    |  1 -
 .../galera/t/galera_concurrent_ctas.test      |  1 -
 .../suite/galera/t/galera_ddl_fk_conflict.cnf |  2 -
 .../galera/t/galera_ddl_fk_conflict.test      |  1 -
 .../suite/galera/t/galera_ddl_multiline.test  |  1 -
 .../galera/t/galera_encrypt_tmp_files.cnf     |  2 +-
 .../galera/t/galera_forced_binlog_format.test |  1 -
 .../suite/galera/t/galera_gcs_fragment.cnf    |  2 +
 .../galera/t/galera_gcs_max_packet_size.cnf   |  2 +
 mysql-test/suite/galera/t/galera_gtid.cnf     |  1 -
 .../suite/galera/t/galera_gtid_server_id.cnf  |  1 -
 .../suite/galera/t/galera_gtid_slave.cnf      |  3 ++
 .../galera/t/galera_gtid_slave_sst_rsync.cnf  |  4 +-
 .../galera/t/galera_gtid_trx_conflict.cnf     |  2 +
 .../suite/galera/t/galera_insert_ignore.test  |  1 -
 .../suite/galera/t/galera_insert_multi.test   |  7 ---
 .../suite/galera/t/galera_ist_progress.cnf    |  3 --
 .../suite/galera/t/galera_ist_recv_bind.cnf   |  1 -
 .../suite/galera/t/galera_kill_applier.cnf    |  2 +
 .../suite/galera/t/galera_load_data.test      |  1 -
 .../suite/galera/t/galera_mdev_13787.cnf      |  2 -
 .../suite/galera/t/galera_mdev_13787.test     |  1 +
 .../suite/galera/t/galera_mdev_15611.cnf      |  1 +
 .../suite/galera/t/galera_mdl_race.test       |  1 -
 .../suite/galera/t/galera_nonPK_and_PA.test   |  1 +
 .../suite/galera/t/galera_nopk_unicode.test   |  1 -
 .../t/galera_parallel_apply_lock_table.test   | 11 ++--
 .../t/galera_parallel_autoinc_largetrx.test   |  1 -
 .../t/galera_parallel_autoinc_manytrx.test    |  2 -
 .../galera/t/galera_parallel_simple.test      |  6 ++-
 .../suite/galera/t/galera_pc_ignore_sb.cnf    |  1 -
 .../suite/galera/t/galera_query_cache.cnf     |  1 -
 .../galera/t/galera_query_cache_sync_wait.cnf |  1 -
 .../t/galera_repl_key_format_flat16.test      |  1 -
 .../galera/t/galera_restart_nochanges.test    |  1 -
 .../suite/galera/t/galera_restart_replica.cnf |  1 -
 .../galera/t/galera_savepoint_replay.test     |  1 -
 mysql-test/suite/galera/t/galera_server.test  |  1 -
 ...alera_set_position_after_cert_failure.test |  1 +
 .../suite/galera/t/galera_sp_bf_abort.inc     |  1 -
 .../galera/t/galera_sql_log_bin_zero.test     |  1 -
 .../suite/galera/t/galera_status_cluster.test |  2 -
 .../galera/t/galera_status_local_index.test   |  1 -
 .../galera/t/galera_status_local_state.test   |  4 --
 .../suite/galera/t/galera_suspend_slave.test  |  1 -
 .../galera/t/galera_sync_wait_upto-master.opt |  2 +-
 .../galera/t/galera_table_with_hyphen.inc     |  1 -
 .../galera/t/galera_temporary_sequences.test  |  1 -
 .../suite/galera/t/galera_threadpool.cnf      |  2 -
 .../suite/galera/t/galera_toi_ftwrl.test      |  1 -
 .../t/galera_transaction_read_only.test       |  1 -
 mysql-test/suite/galera/t/galera_udf.cnf      |  7 ---
 .../galera/t/galera_unicode_identifiers.test  |  1 -
 .../suite/galera/t/galera_v1_row_events.cnf   |  7 ---
 .../galera/t/galera_var_OSU_method2.test      |  1 -
 .../t/galera_var_auto_inc_control_on.cnf      |  6 ---
 .../galera/t/galera_var_slave_threads.test    | 17 +++++-
 .../suite/galera/t/galera_wan_restart_sst.cnf |  1 -
 .../galera/t/galera_wsrep_log_conficts.cnf    |  5 --
 .../galera_wsrep_provider_options_syntax.test |  1 +
 mysql-test/suite/galera/t/mdev-31285.test     |  2 -
 mysql-test/suite/galera/t/mysql-wsrep#198.cnf |  2 -
 .../suite/galera/t/mysql-wsrep#198.test       |  3 +-
 mysql-test/suite/galera/t/mysql-wsrep#201.cnf |  2 -
 .../suite/galera/t/mysql-wsrep#247.test       |  1 -
 mysql-test/suite/galera/t/mysql-wsrep#31.test |  2 -
 mysql-test/suite/galera/t/mysql-wsrep#33.cnf  |  1 -
 .../suite/galera/t/mysql-wsrep#332.test       |  1 -
 mysql-test/suite/galera/t/rename.test         |  1 -
 mysql-test/suite/galera/t/view.test           |  1 -
 .../r/galera_parallel_apply_3nodes.result     |  2 +-
 mysql-test/suite/galera_3nodes/suite.pm       | 54 +++++++++----------
 .../galera_3nodes/t/galera-features#119.test  |  1 -
 .../t/galera_certification_ccc.test           |  1 -
 .../t/galera_evs_suspect_timeout.test         |  1 +
 .../t/galera_parallel_apply_3nodes.test       |  2 +-
 .../t/galera_wsrep_schema_init.test           |  1 -
 .../t/inconsistency_shutdown.cnf              |  3 +-
 .../galera_sr_kill_slave_before_apply.result  |  2 +-
 mysql-test/suite/galera_3nodes_sr/suite.pm    | 22 ++++----
 .../suite/galera_3nodes_sr/t/GCF-606.test     |  1 +
 ...a_sr_kill_slave_after_apply_rollback2.test |  1 +
 .../t/galera_sr_kill_slave_before_apply.test  |  2 +-
 .../t/galera_sr_threeway_split.cnf            |  1 -
 .../t/galera_vote_sr-master.opt               |  1 -
 .../galera_sr/r/galera_sr_cc_master.result    |  2 +-
 .../r/mysql-wsrep-features#148.result         |  2 +-
 mysql-test/suite/galera_sr/suite.pm           | 54 +++++++++----------
 mysql-test/suite/galera_sr/t/MDEV-27615.test  |  1 -
 .../galera_sr/t/galera_sr_cc_master.test      |  2 +-
 .../galera_sr/t/galera_sr_gtid-master.opt     |  2 +-
 .../galera_sr/t/galera_sr_mysqldump_sst.cnf   |  1 -
 .../galera_sr/t/galera_sr_small_gcache.cnf    |  3 +-
 .../galera_sr/t/mysql-wsrep-features#14.test  |  1 -
 .../galera_sr/t/mysql-wsrep-features#148.test |  2 +-
 .../galera_sr/t/mysql-wsrep-features#22.test  |  1 -
 .../galera_sr/t/mysql-wsrep-features#96.test  |  4 --
 mysql-test/suite/wsrep/r/plugin.result        |  2 +-
 mysql-test/suite/wsrep/suite.pm               |  6 +--
 mysql-test/suite/wsrep/t/binlog_format.cnf    |  1 -
 mysql-test/suite/wsrep/t/foreign_key.test     |  1 -
 mysql-test/suite/wsrep/t/mdev_10186.test      |  1 -
 mysql-test/suite/wsrep/t/mdev_7798.cnf        |  1 -
 mysql-test/suite/wsrep/t/plugin.test          |  2 +-
 mysql-test/suite/wsrep/t/wsrep-recover.cnf    |  2 +-
 .../wsrep/t/wsrep_forced_binlog_format.test   |  1 -
 mysql-test/suite/wsrep/t/wsrep_rpl.test       |  1 -
 .../wsrep/t/wsrep_variables_sst_method.test   |  1 -
 .../wsrep/t/wsrep_variables_wsrep_off.cnf     |  1 -
 sql/wsrep_mysqld.cc                           |  9 ++--
 161 files changed, 215 insertions(+), 321 deletions(-)

diff --git a/mysql-test/suite/galera/r/MDEV-20225.result b/mysql-test/suite/galera/r/MDEV-20225.result
index 245051309d1..47c21249c8d 100644
--- a/mysql-test/suite/galera/r/MDEV-20225.result
+++ b/mysql-test/suite/galera/r/MDEV-20225.result
@@ -15,7 +15,7 @@ connection node_2a;
 SET GLOBAL debug_dbug = 'RESET';
 SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
 SET DEBUG_SYNC = 'RESET';
-SET GLOBAL wsrep_slave_threads = 1;
+SET GLOBAL wsrep_slave_threads = DEFAULT;
 connection node_2;
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
diff --git a/mysql-test/suite/galera/r/MDEV-20793.result b/mysql-test/suite/galera/r/MDEV-20793.result
index feb068f258f..d37c0b79165 100644
--- a/mysql-test/suite/galera/r/MDEV-20793.result
+++ b/mysql-test/suite/galera/r/MDEV-20793.result
@@ -41,4 +41,4 @@ connection node_1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 SET debug_sync = "RESET";
 DROP TABLE t1;
-SET GLOBAL wsrep_slave_threads = 1;
+SET GLOBAL wsrep_slave_threads = DEFAULT;
diff --git a/mysql-test/suite/galera/r/MDEV-25389.result b/mysql-test/suite/galera/r/MDEV-25389.result
index f369fe4dbae..fe3975fe163 100644
--- a/mysql-test/suite/galera/r/MDEV-25389.result
+++ b/mysql-test/suite/galera/r/MDEV-25389.result
@@ -15,3 +15,4 @@ SET GLOBAL wsrep_slave_threads=1;
 SELECT @@wsrep_slave_threads;
 @@wsrep_slave_threads
 1
+connection node_2;
diff --git a/mysql-test/suite/galera/r/galera_applier_ftwrl_table_alter.result b/mysql-test/suite/galera/r/galera_applier_ftwrl_table_alter.result
index 451b2c80c2a..f0f67c28a28 100644
--- a/mysql-test/suite/galera/r/galera_applier_ftwrl_table_alter.result
+++ b/mysql-test/suite/galera/r/galera_applier_ftwrl_table_alter.result
@@ -13,7 +13,7 @@ connection node_1;
 SELECT 1 FROM DUAL;
 1
 1
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock';
+SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 COUNT(*) = 1
 1
 UNLOCK TABLES;
@@ -25,7 +25,7 @@ t1	CREATE TABLE `t1` (
   `f2` int(11) DEFAULT NULL,
   PRIMARY KEY (`f1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock';
+SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result b/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result
index 226aebde69e..cf0f1bf8e24 100644
--- a/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result
+++ b/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result
@@ -298,6 +298,7 @@ DROP TABLE p1, p2;
 ######################################################################
 connection node_1;
 SET SESSION wsrep_sync_wait=0;
+FLUSH STATUS;
 CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
 INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
 CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
@@ -491,6 +492,7 @@ Note	1051	Unknown table 'test.tmp1,test.tmp2'
 ######################################################################
 connection node_1;
 SET SESSION wsrep_sync_wait=0;
+FLUSH STATUS;
 CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
 INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
 CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
@@ -684,6 +686,7 @@ Note	1051	Unknown table 'test.tmp1,test.tmp2'
 ######################################################################
 connection node_1;
 SET SESSION wsrep_sync_wait=0;
+FLUSH STATUS;
 CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
 INSERT INTO p1 VALUES (1, 'INITIAL VALUE');
 CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30));
diff --git a/mysql-test/suite/galera/r/galera_parallel_apply_lock_table.result b/mysql-test/suite/galera/r/galera_parallel_apply_lock_table.result
index a15b0c7df69..b1ba03a8391 100644
--- a/mysql-test/suite/galera/r/galera_parallel_apply_lock_table.result
+++ b/mysql-test/suite/galera/r/galera_parallel_apply_lock_table.result
@@ -10,10 +10,10 @@ INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
 connection node_2a;
 SET SESSION wsrep_sync_wait=0;
-SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committing%' or STATE = 'Waiting for certification');
+SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification');
 EXPECT_1
 1
-SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%Waiting for table metadata lock%';
+SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 EXPECT_1
 1
 SELECT COUNT(*) AS EXPECT_0 FROM t1;
@@ -32,9 +32,8 @@ EXPECT_1
 SELECT COUNT(*) AS EXPECT_1 FROM t2;
 EXPECT_1
 1
-SELECT COUNT(*) AS EXPECT_2  FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committed%' or STATE = 'Waiting for certification');
+SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committed%' OR STATE LIKE 'Waiting for certification');
 EXPECT_2
 2
-SET GLOBAL wsrep_slave_threads = 1;;
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera/r/galera_parallel_simple.result b/mysql-test/suite/galera/r/galera_parallel_simple.result
index cac784cd16f..46b00539fb1 100644
--- a/mysql-test/suite/galera/r/galera_parallel_simple.result
+++ b/mysql-test/suite/galera/r/galera_parallel_simple.result
@@ -34,6 +34,5 @@ expect_20
 SELECT COUNT(*) as expect_20 FROM t2;
 expect_20
 20
-SET GLOBAL wsrep_slave_threads = 1;;
 DROP TABLE t1;
 DROP TABLE t2;
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 936f58b89a0..a835cbf527e 100644
--- a/mysql-test/suite/galera/r/galera_var_slave_threads.result
+++ b/mysql-test/suite/galera/r/galera_var_slave_threads.result
@@ -33,7 +33,6 @@ connection node_2;
 SELECT COUNT(*) FROM t2;
 COUNT(*)
 70
-SET GLOBAL wsrep_slave_threads = 1;
 DROP TABLE t1;
 DROP TABLE t2;
 #
diff --git a/mysql-test/suite/galera/r/wsrep_strict_ddl.result b/mysql-test/suite/galera/r/wsrep_strict_ddl.result
index 7b166f00bc3..37332fb19a3 100644
--- a/mysql-test/suite/galera/r/wsrep_strict_ddl.result
+++ b/mysql-test/suite/galera/r/wsrep_strict_ddl.result
@@ -20,7 +20,7 @@ ERROR HY000: DDL-statement is forbidden as table storage engine does not support
 SHOW WARNINGS;
 Level	Code	Message
 Error	4165	DDL-statement is forbidden as table storage engine does not support Galera replication
-Warning	1031	WSREP: wsrep_strict_dll enabled. Storage engine Aria not supported.
+Warning	1031	WSREP: wsrep_strict_ddl enabled. Storage engine Aria not supported.
 connection node_2;
 SHOW CREATE TABLE t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -31,9 +31,9 @@ ERROR HY000: DDL-statement is forbidden as table storage engine does not support
 SHOW WARNINGS;
 Level	Code	Message
 Error	4165	DDL-statement is forbidden as table storage engine does not support Galera replication
-Warning	1031	WSREP: wsrep_strict_dll enabled. Storage engine MyISAM not supported.
+Warning	1031	WSREP: wsrep_strict_ddl enabled. Storage engine MyISAM not supported.
 Error	4165	DDL-statement is forbidden as table storage engine does not support Galera replication
-Warning	1031	WSREP: wsrep_strict_dll enabled. Storage engine MyISAM not supported.
+Warning	1031	WSREP: wsrep_strict_ddl enabled. Storage engine MyISAM not supported.
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 825525765ca..404025fb175 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -11,58 +11,58 @@ 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: Could not open saved state file for reading: .*),
-     qr(WSREP: Could not open state file for reading: .*),
+     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: 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: Releasing seqno [0-9]* before [0-9]* was assigned\.),
-     qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
+     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: 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: 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: 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: Maximum writeset size exceeded by .*),
-     qr(WSREP: transaction size exceeded.*),
-     qr(WSREP: RBR event .*),
-     qr(WSREP: Ignoring error for TO isolated action: .*),
-     qr(WSREP: transaction size limit .*),
-     qr(WSREP: rbr write fail, .*),
-     qr(WSREP: .*Backend not supported: foo.*),
-     qr(WSREP: .*Failed to initialize backend using .*),
-     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: Maximum writeset size exceeded by ),
+     qr(WSREP: transaction size exceeded),
+     qr(WSREP: RBR event ),
+     qr(WSREP: Ignoring error for TO isolated action: ),
+     qr(WSREP: transaction size limit ),
+     qr(WSREP: rbr write fail, ),
+     qr(WSREP: .*Backend not supported: foo),
+     qr(WSREP: .*Failed to initialize backend using ),
+     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at ),
      qr(WSREP: gcs connect failed: Socket type not supported),
      qr(WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 .*),
-     qr(WSREP: .*Failed to open backend connection: -110 .*),
-     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: .*Failed to open backend connection: -110 ),
+     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: 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: 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: 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: 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: .*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: .*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: Trying to continue unpaused monitor|,
diff --git a/mysql-test/suite/galera/t/MDEV-10715.cnf b/mysql-test/suite/galera/t/MDEV-10715.cnf
index 589514466ed..1422f977bf7 100644
--- a/mysql-test/suite/galera/t/MDEV-10715.cnf
+++ b/mysql-test/suite/galera/t/MDEV-10715.cnf
@@ -4,11 +4,13 @@
 log-bin=mysqld-bin
 log-slave-updates
 binlog-format=ROW
+
 [mysqld.1]
 gtid-domain-id=1
 wsrep_gtid_mode=1
 wsrep_gtid_domain_id=1
+
 [mysqld.2]
 gtid-domain-id=1
 wsrep_gtid_mode=1
-wsrep_gtid_domain_id=1
\ No newline at end of file
+wsrep_gtid_domain_id=1
diff --git a/mysql-test/suite/galera/t/MDEV-15443.cnf b/mysql-test/suite/galera/t/MDEV-15443.cnf
index 88a08203d01..f8c6733de16 100644
--- a/mysql-test/suite/galera/t/MDEV-15443.cnf
+++ b/mysql-test/suite/galera/t/MDEV-15443.cnf
@@ -1,5 +1,7 @@
 !include ../galera_2nodes.cnf
+
 [mysqld.1]
 wsrep_auto_increment_control=OFF
+
 [mysqld.2]
 wsrep_auto_increment_control=OFF
diff --git a/mysql-test/suite/galera/t/MDEV-20225.test b/mysql-test/suite/galera/t/MDEV-20225.test
index 60ab1c53e40..43c763e1d16 100644
--- a/mysql-test/suite/galera/t/MDEV-20225.test
+++ b/mysql-test/suite/galera/t/MDEV-20225.test
@@ -41,7 +41,7 @@ INSERT INTO t1 VALUES (NULL);
 SET GLOBAL debug_dbug = 'RESET';
 SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
 SET DEBUG_SYNC = 'RESET';
-SET GLOBAL wsrep_slave_threads = 1;
+SET GLOBAL wsrep_slave_threads = DEFAULT;
 
 --connection node_2
 # Trigger should now be dropped on node_2.
diff --git a/mysql-test/suite/galera/t/MDEV-20793.test b/mysql-test/suite/galera/t/MDEV-20793.test
index 6835a73a2a4..67140d06e71 100644
--- a/mysql-test/suite/galera/t/MDEV-20793.test
+++ b/mysql-test/suite/galera/t/MDEV-20793.test
@@ -99,4 +99,4 @@ SET SESSION debug_sync = "now SIGNAL continue";
 SET debug_sync = "RESET";
 
 DROP TABLE t1;
-SET GLOBAL wsrep_slave_threads = 1;
+SET GLOBAL wsrep_slave_threads = DEFAULT;
diff --git a/mysql-test/suite/galera/t/MDEV-22227.test b/mysql-test/suite/galera/t/MDEV-22227.test
index 0ee75b979e2..e3c4565958b 100644
--- a/mysql-test/suite/galera/t/MDEV-22227.test
+++ b/mysql-test/suite/galera/t/MDEV-22227.test
@@ -13,7 +13,7 @@ SET lock_wait_timeout= 1;
 --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1
 --connection node_1b
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Waiting for table level lock'
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table level lock'
 --source include/wait_condition.inc
 
 --connection node_1
diff --git a/mysql-test/suite/galera/t/MDEV-22708.cnf b/mysql-test/suite/galera/t/MDEV-22708.cnf
index f7ac4f43082..4c62448fe3d 100644
--- a/mysql-test/suite/galera/t/MDEV-22708.cnf
+++ b/mysql-test/suite/galera/t/MDEV-22708.cnf
@@ -1,4 +1,4 @@
 !include ../galera_2nodes.cnf
 
 [mysqld]
-log-bin
\ No newline at end of file
+log-bin
diff --git a/mysql-test/suite/galera/t/MDEV-24143.test b/mysql-test/suite/galera/t/MDEV-24143.test
index 3aecac8cb07..391c93a875c 100644
--- a/mysql-test/suite/galera/t/MDEV-24143.test
+++ b/mysql-test/suite/galera/t/MDEV-24143.test
@@ -21,4 +21,3 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, b INT) ENGINE=SEQUENCE;
 ALTER TABLE t1 DROP COLUMN c2;
 SELECT get_lock ('test', 1.5);
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera/t/MDEV-24327.cnf b/mysql-test/suite/galera/t/MDEV-24327.cnf
index 390a9aab0f4..d3e98435699 100644
--- a/mysql-test/suite/galera/t/MDEV-24327.cnf
+++ b/mysql-test/suite/galera/t/MDEV-24327.cnf
@@ -3,4 +3,3 @@
 [mysqld.1]
 log-bin=mariadb-bin
 log-slave-updates=OFF
-
diff --git a/mysql-test/suite/galera/t/MDEV-25389.test b/mysql-test/suite/galera/t/MDEV-25389.test
index fc523371918..0bc7d8de9d5 100644
--- a/mysql-test/suite/galera/t/MDEV-25389.test
+++ b/mysql-test/suite/galera/t/MDEV-25389.test
@@ -7,6 +7,8 @@
 --source ../galera/include/auto_increment_offset_save.inc
 
 --connection node_2
+--let $wsrep_slave_threads_orig = `SELECT @@wsrep_slave_threads`
+
 call mtr.add_suppression("WSREP: Failed to create/initialize system thread");
 SET GLOBAL debug_dbug='+d,wsrep_simulate_failed_connection_1';
 --error ER_WRONG_ARGUMENTS
@@ -21,4 +23,9 @@ SELECT @@wsrep_slave_threads;
 # issue is fixed.
 --source include/restart_mysqld.inc
 
+--connection node_2
+--disable_query_log
+--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
+--enable_query_log
+
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/MDEV-25731.test b/mysql-test/suite/galera/t/MDEV-25731.test
index c26fad2fa6a..cf2a030d994 100644
--- a/mysql-test/suite/galera/t/MDEV-25731.test
+++ b/mysql-test/suite/galera/t/MDEV-25731.test
@@ -23,5 +23,3 @@ SELECT COUNT(*) AS EXPECT_12 FROM t1;
 DROP TABLE t1;
 SET GLOBAL wsrep_load_data_splitting=OFF;
 SET GLOBAL wsrep_replicate_myisam=OFF;
-
-
diff --git a/mysql-test/suite/galera/t/MDEV-26597.test b/mysql-test/suite/galera/t/MDEV-26597.test
index 465f1130443..7a57400c83d 100644
--- a/mysql-test/suite/galera/t/MDEV-26597.test
+++ b/mysql-test/suite/galera/t/MDEV-26597.test
@@ -28,5 +28,3 @@ SET SESSION wsrep_sync_wait = 0;
 --source ../../galera/include/auto_increment_offset_restore.inc
 --connection node_1
 DROP TABLE t3;
-
-
diff --git a/mysql-test/suite/galera/t/MDEV-27123.opt b/mysql-test/suite/galera/t/MDEV-27123.opt
index 1c4accb816a..2a71a656039 100644
--- a/mysql-test/suite/galera/t/MDEV-27123.opt
+++ b/mysql-test/suite/galera/t/MDEV-27123.opt
@@ -1,2 +1 @@
 --wsrep_auto_increment_control=OFF --auto_increment_increment=3 --auto_increment_offset=3
-
diff --git a/mysql-test/suite/galera/t/MDEV-29293.test b/mysql-test/suite/galera/t/MDEV-29293.test
index dacbf714c06..cf14a640035 100644
--- a/mysql-test/suite/galera/t/MDEV-29293.test
+++ b/mysql-test/suite/galera/t/MDEV-29293.test
@@ -38,4 +38,3 @@ set debug_sync= 'now SIGNAL continue';
 --reap 
 DROP TABLE t1;
 SET DEBUG_SYNC= 'RESET';
-
diff --git a/mysql-test/suite/galera/t/MDEV-29512.cnf b/mysql-test/suite/galera/t/MDEV-29512.cnf
index bf8e0c37984..136a8842a56 100644
--- a/mysql-test/suite/galera/t/MDEV-29512.cnf
+++ b/mysql-test/suite/galera/t/MDEV-29512.cnf
@@ -10,6 +10,4 @@ log_slave_updates
 max-binlog-size=4096
 expire-logs-days=1
 
-
 [mysqld.2]
-
diff --git a/mysql-test/suite/galera/t/MDEV-6860.cnf b/mysql-test/suite/galera/t/MDEV-6860.cnf
index d8defd343ad..71934249b25 100644
--- a/mysql-test/suite/galera/t/MDEV-6860.cnf
+++ b/mysql-test/suite/galera/t/MDEV-6860.cnf
@@ -1,7 +1,8 @@
 !include ../galera_2nodes_as_slave.cnf
 
+[mysqld.1]
+wsrep-slave-threads=10
+
 [mysqld.2]
 slave-parallel-threads=2
 slave-parallel-mode=optimistic
-[mysqld.1]
-wsrep-slave-threads=10
diff --git a/mysql-test/suite/galera/t/MW-259.test b/mysql-test/suite/galera/t/MW-259.test
index 7298285f6ff..61e0f19e5bb 100644
--- a/mysql-test/suite/galera/t/MW-259.test
+++ b/mysql-test/suite/galera/t/MW-259.test
@@ -39,4 +39,3 @@ SET GLOBAL wsrep_desync=0;
 
 # Cleanup
 SET DEBUG_SYNC= 'RESET';
-
diff --git a/mysql-test/suite/galera/t/MW-313.cnf b/mysql-test/suite/galera/t/MW-313.cnf
index 184900c58fd..98e724fb2d0 100644
--- a/mysql-test/suite/galera/t/MW-313.cnf
+++ b/mysql-test/suite/galera/t/MW-313.cnf
@@ -7,6 +7,3 @@ log-slave-updates
 [mysqld.2]
 log-bin
 log-slave-updates
-
-
-
diff --git a/mysql-test/suite/galera/t/MW-360-master.opt b/mysql-test/suite/galera/t/MW-360-master.opt
index e51c49c3808..35922307c93 100644
--- a/mysql-test/suite/galera/t/MW-360-master.opt
+++ b/mysql-test/suite/galera/t/MW-360-master.opt
@@ -1,2 +1 @@
 --gtid-domain-id=1 --log-bin --log-slave-updates
-
diff --git a/mysql-test/suite/galera/t/MW-369.inc b/mysql-test/suite/galera/t/MW-369.inc
index 3b0a32bdd9d..f2d59245d7d 100644
--- a/mysql-test/suite/galera/t/MW-369.inc
+++ b/mysql-test/suite/galera/t/MW-369.inc
@@ -80,5 +80,3 @@ SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb';
 
 SET GLOBAL DEBUG_DBUG = "";
 SET DEBUG_SYNC = 'RESET';
-
-
diff --git a/mysql-test/suite/galera/t/MW-86-wait8.cnf b/mysql-test/suite/galera/t/MW-86-wait8.cnf
index 8f6a760def0..98e724fb2d0 100644
--- a/mysql-test/suite/galera/t/MW-86-wait8.cnf
+++ b/mysql-test/suite/galera/t/MW-86-wait8.cnf
@@ -7,4 +7,3 @@ log-slave-updates
 [mysqld.2]
 log-bin
 log-slave-updates
-
diff --git a/mysql-test/suite/galera/t/create.test b/mysql-test/suite/galera/t/create.test
index 96a6640c21f..01b78d1ff41 100644
--- a/mysql-test/suite/galera/t/create.test
+++ b/mysql-test/suite/galera/t/create.test
@@ -86,4 +86,3 @@ DROP TABLE t1, t2;
 
 --source include/galera_end.inc
 --echo # End of tests
-
diff --git a/mysql-test/suite/galera/t/galera_MDEV-29512.cnf b/mysql-test/suite/galera/t/galera_MDEV-29512.cnf
index bf8e0c37984..136a8842a56 100644
--- a/mysql-test/suite/galera/t/galera_MDEV-29512.cnf
+++ b/mysql-test/suite/galera/t/galera_MDEV-29512.cnf
@@ -10,6 +10,4 @@ log_slave_updates
 max-binlog-size=4096
 expire-logs-days=1
 
-
 [mysqld.2]
-
diff --git a/mysql-test/suite/galera/t/galera_applier_ftwrl_table.test b/mysql-test/suite/galera/t/galera_applier_ftwrl_table.test
index 97819384a75..4e17ddf2e4c 100644
--- a/mysql-test/suite/galera/t/galera_applier_ftwrl_table.test
+++ b/mysql-test/suite/galera/t/galera_applier_ftwrl_table.test
@@ -20,7 +20,7 @@ INSERT INTO t1 VALUES (2);
 --connection node_1a
 SET SESSION wsrep_sync_wait = 0;
 
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 --source include/wait_condition.inc
 
 SELECT COUNT(*) = 0 FROM t1;
diff --git a/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.cnf b/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.cnf
index 4d93a1b2509..3b7a713c30c 100644
--- a/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.cnf
+++ b/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.cnf
@@ -9,6 +9,3 @@ wait_timeout=5
 lock_wait_timeout=5
 innodb_lock_wait_timeout=5
 wait_timeout=5
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.test b/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.test
index d62b6552973..9d9ec4bbee3 100644
--- a/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.test
+++ b/mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.test
@@ -27,16 +27,16 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
 --connection node_1
 SELECT 1 FROM DUAL;
 # Wait
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock';
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock';
+SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 
 UNLOCK TABLES;
 
 SET SESSION wsrep_sync_wait = 15;
 
 SHOW CREATE TABLE t1;
-SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock';
+SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_as_slave_ctas.test b/mysql-test/suite/galera/t/galera_as_slave_ctas.test
index 32301a3d0d3..36d7f00ae87 100644
--- a/mysql-test/suite/galera/t/galera_as_slave_ctas.test
+++ b/mysql-test/suite/galera/t/galera_as_slave_ctas.test
@@ -73,4 +73,3 @@ RESET SLAVE ALL;
 
 --connection node_3
 RESET MASTER;
-
diff --git a/mysql-test/suite/galera/t/galera_backup_stage.test b/mysql-test/suite/galera/t/galera_backup_stage.test
index ef0706f9ab1..2756ebcf719 100644
--- a/mysql-test/suite/galera/t/galera_backup_stage.test
+++ b/mysql-test/suite/galera/t/galera_backup_stage.test
@@ -56,7 +56,7 @@ ALTER TABLE t1 ADD COLUMN (f4 int(10));
 # reach commit stage. In the unlikely case the interleaving is different, the
 # result of the test should not change.
 --connection node_1c
---let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (State='Commit' OR State='Waiting for certification') AND ID=$insert_id
+--let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification') AND ID=$insert_id
 --source include/wait_condition.inc
 --let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id
 --source include/wait_condition.inc
@@ -83,11 +83,11 @@ ALTER TABLE t1 ADD COLUMN (f4 int(10));
 
 # wait for insert to get blocked
 --connection node_1c
---let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (State='Commit' OR State='Waiting for certification') AND ID=$insert_id
+--let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.processlist WHERE (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification') AND ID=$insert_id
 --source include/wait_condition.inc
 --let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id
 --source include/wait_condition.inc
---let $wait_condition = SELECT COUNT(*)=2 FROM information_schema.processlist WHERE Info like 'INSERT INTO t1 (f1) values("node1%")' AND (State='Commit' or State='Waiting for certification')
+--let $wait_condition = SELECT COUNT(*)=2 FROM information_schema.processlist WHERE Info like 'INSERT INTO t1 (f1) values("node1%")' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification')
 --source include/wait_condition.inc
 
 # nothing after BLOCK_DDL is applied
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_at_after_statement.test b/mysql-test/suite/galera/t/galera_bf_abort_at_after_statement.test
index 224db902569..5550c9a1c66 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_at_after_statement.test
+++ b/mysql-test/suite/galera/t/galera_bf_abort_at_after_statement.test
@@ -55,4 +55,3 @@ DROP TABLE t1;
 
 --disconnect node_2a
 --disconnect node_2b
-
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test b/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
index fde783e2cef..1227abb10f6 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
+++ b/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
@@ -17,12 +17,12 @@ INSERT INTO t1 VALUES (2);
 
 --connection node_2
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 --source include/wait_condition.inc
 
 UNLOCK TABLES;
 
---let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'
+--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 --source include/wait_condition.inc
 
 COMMIT;
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_lock_table.cnf b/mysql-test/suite/galera/t/galera_bf_abort_lock_table.cnf
index 033e6f8b99a..fa33b09d739 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_lock_table.cnf
+++ b/mysql-test/suite/galera/t/galera_bf_abort_lock_table.cnf
@@ -1,5 +1 @@
 !include ../galera_2nodes.cnf
-
-[mysqld.1]
-wsrep-debug=1
-loose-galera-bf-abort-lock-table=1
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test b/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
index 06009712c7b..652e89f8e57 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
+++ b/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
@@ -1,6 +1,5 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
---source include/force_restart.inc
 
 #
 # Test that a local LOCK TABLE will NOT be broken by an incoming remote transaction against that table
@@ -18,13 +17,13 @@ INSERT INTO t1 VALUES (2);
 
 --connection node_2
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 --let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 --source include/wait_condition_with_debug_and_kill.inc
 
 UNLOCK TABLES;
 
---let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'
+--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 --let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 --source include/wait_condition_with_debug_and_kill.inc
 
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_ps.cnf b/mysql-test/suite/galera/t/galera_bf_abort_ps.cnf
index 34c1a8cc3cf..ee365a18340 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_ps.cnf
+++ b/mysql-test/suite/galera/t/galera_bf_abort_ps.cnf
@@ -1,3 +1,4 @@
 !include ../galera_2nodes.cnf
+
 [mysqltest]
-ps-protocol
\ No newline at end of file
+ps-protocol
diff --git a/mysql-test/suite/galera/t/galera_bf_background_statistics.cnf b/mysql-test/suite/galera/t/galera_bf_background_statistics.cnf
index 4101b4073ec..90f99fcdd21 100644
--- a/mysql-test/suite/galera/t/galera_bf_background_statistics.cnf
+++ b/mysql-test/suite/galera/t/galera_bf_background_statistics.cnf
@@ -5,5 +5,3 @@ innodb_stats_persistent=ON
 
 [mysqld.2]
 innodb_stats_persistent=ON
-
-
diff --git a/mysql-test/suite/galera/t/galera_bf_background_statistics.test b/mysql-test/suite/galera/t/galera_bf_background_statistics.test
index a9a98b1b567..0ffd4895f5b 100644
--- a/mysql-test/suite/galera/t/galera_bf_background_statistics.test
+++ b/mysql-test/suite/galera/t/galera_bf_background_statistics.test
@@ -46,4 +46,3 @@ ALTER TABLE t1 CHANGE f2 f2 INTEGER NOT NULL DEFAULT 1;
 --enable_query_log
 
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera/t/galera_bf_kill.test b/mysql-test/suite/galera/t/galera_bf_kill.test
index 1cb2e866cb4..6947733bb24 100644
--- a/mysql-test/suite/galera/t/galera_bf_kill.test
+++ b/mysql-test/suite/galera/t/galera_bf_kill.test
@@ -111,7 +111,7 @@ update t1 set a =5, b=2;
 
 --connection node_2b
 SET SESSION wsrep_sync_wait=0;
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Waiting for table metadata lock';
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%';
 --source include/wait_condition.inc
 
 --connection node_2a
diff --git a/mysql-test/suite/galera/t/galera_bf_lock_wait.test b/mysql-test/suite/galera/t/galera_bf_lock_wait.test
index 8ef2fee78ed..9ad3bbc36c6 100644
--- a/mysql-test/suite/galera/t/galera_bf_lock_wait.test
+++ b/mysql-test/suite/galera/t/galera_bf_lock_wait.test
@@ -95,4 +95,3 @@ drop procedure p1;
 --disconnect node_1_p2
 --disconnect node_2_p1
 --disconnect node_2_p2
-
diff --git a/mysql-test/suite/galera/t/galera_binlog_checksum.cnf b/mysql-test/suite/galera/t/galera_binlog_checksum.cnf
index bd61ee67406..590cecf36bc 100644
--- a/mysql-test/suite/galera/t/galera_binlog_checksum.cnf
+++ b/mysql-test/suite/galera/t/galera_binlog_checksum.cnf
@@ -9,5 +9,3 @@ slave-sql-verify-checksum=1
 binlog-checksum=CRC32
 master-verify-checksum=1
 slave-sql-verify-checksum=1
-
-
diff --git a/mysql-test/suite/galera/t/galera_binlog_event_max_size_max.cnf b/mysql-test/suite/galera/t/galera_binlog_event_max_size_max.cnf
index 9315086a3cc..5f0809ddf07 100644
--- a/mysql-test/suite/galera/t/galera_binlog_event_max_size_max.cnf
+++ b/mysql-test/suite/galera/t/galera_binlog_event_max_size_max.cnf
@@ -4,6 +4,3 @@
 binlog-row-event-max-size=4294967040
 
 [mysqld.2]
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.cnf b/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.cnf
index 798435d8e54..5899387f52d 100644
--- a/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.cnf
+++ b/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.cnf
@@ -4,6 +4,3 @@
 binlog-row-event-max-size=256
 
 [mysqld.2]
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.test b/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.test
index 00b55339770..43ea0932676 100644
--- a/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.test
+++ b/mysql-test/suite/galera/t/galera_binlog_event_max_size_min.test
@@ -12,4 +12,3 @@ INSERT INTO t1 VALUES (REPEAT('x', 1000));
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = REPEAT('x', 1000);
 
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera/t/galera_binlog_row_image.test b/mysql-test/suite/galera/t/galera_binlog_row_image.test
index 70262ec44ca..5c544414b9e 100644
--- a/mysql-test/suite/galera/t/galera_binlog_row_image.test
+++ b/mysql-test/suite/galera/t/galera_binlog_row_image.test
@@ -94,7 +94,3 @@ SELECT COUNT(*) = 0 FROM t2;
 
 DROP TABLE t1;
 DROP TABLE t2;
-
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_change_user.test b/mysql-test/suite/galera/t/galera_change_user.test
index 89efef1dbb0..5051b18eec6 100644
--- a/mysql-test/suite/galera/t/galera_change_user.test
+++ b/mysql-test/suite/galera/t/galera_change_user.test
@@ -26,4 +26,3 @@ reset_connection;
 --connection node_1
 DROP TABLE t1;
 DROP USER user1;
-
diff --git a/mysql-test/suite/galera/t/galera_concurrent_ctas.test b/mysql-test/suite/galera/t/galera_concurrent_ctas.test
index ed579f19a0d..199cd727df0 100644
--- a/mysql-test/suite/galera/t/galera_concurrent_ctas.test
+++ b/mysql-test/suite/galera/t/galera_concurrent_ctas.test
@@ -98,4 +98,3 @@ DROP TABLE t1;
 
 --source include/galera_end.inc
 --echo # End of test
-
diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf
index 2975070498e..106d79a503e 100644
--- a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf
+++ b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf
@@ -7,5 +7,3 @@ loose-galera-ddl-fk-conflict=1
 [mysqld.2]
 wsrep-debug=1
 loose-galera-ddl-fk-conflict=1
-
-
diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test
index a8fb6614e41..22da69dfc24 100644
--- a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test
+++ b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test
@@ -43,4 +43,3 @@ SET SESSION wsrep_sync_wait=0;
 --source galera_ddl_fk_conflict_with_tmp.inc
 
 # CHECK and ANALYZE are not affected
-
diff --git a/mysql-test/suite/galera/t/galera_ddl_multiline.test b/mysql-test/suite/galera/t/galera_ddl_multiline.test
index c7155d066fa..dc69dfd186f 100644
--- a/mysql-test/suite/galera/t/galera_ddl_multiline.test
+++ b/mysql-test/suite/galera/t/galera_ddl_multiline.test
@@ -51,4 +51,3 @@ SHOW CREATE TABLE t6;
 
 --connection node_1
 DROP TABLE t1, t2, t3, t4, t5, t6;
-
diff --git a/mysql-test/suite/galera/t/galera_encrypt_tmp_files.cnf b/mysql-test/suite/galera/t/galera_encrypt_tmp_files.cnf
index 0f7f80b7d0b..a26c4b30b00 100644
--- a/mysql-test/suite/galera/t/galera_encrypt_tmp_files.cnf
+++ b/mysql-test/suite/galera/t/galera_encrypt_tmp_files.cnf
@@ -1,6 +1,6 @@
 !include ../galera_2nodes.cnf
-[mysqld]
 
+[mysqld]
 encrypt-tmp-files = 1
 plugin-load-add= @ENV.FILE_KEY_MANAGEMENT_SO
 file-key-management
diff --git a/mysql-test/suite/galera/t/galera_forced_binlog_format.test b/mysql-test/suite/galera/t/galera_forced_binlog_format.test
index 786837239ed..2866d6fee88 100644
--- a/mysql-test/suite/galera/t/galera_forced_binlog_format.test
+++ b/mysql-test/suite/galera/t/galera_forced_binlog_format.test
@@ -49,4 +49,3 @@ DROP DATABASE testdb_9401;
 
 #--source include/galera_end.inc
 --echo # End of tests
-
diff --git a/mysql-test/suite/galera/t/galera_gcs_fragment.cnf b/mysql-test/suite/galera/t/galera_gcs_fragment.cnf
index aae3fee5904..5d7bbf7b053 100644
--- a/mysql-test/suite/galera/t/galera_gcs_fragment.cnf
+++ b/mysql-test/suite/galera/t/galera_gcs_fragment.cnf
@@ -1,5 +1,7 @@
 !include ../galera_2nodes.cnf
+
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcs.max_packet_size=64'
+
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcs.max_packet_size=64'
diff --git a/mysql-test/suite/galera/t/galera_gcs_max_packet_size.cnf b/mysql-test/suite/galera/t/galera_gcs_max_packet_size.cnf
index 6bb11e5957a..7e7c99ecb63 100644
--- a/mysql-test/suite/galera/t/galera_gcs_max_packet_size.cnf
+++ b/mysql-test/suite/galera/t/galera_gcs_max_packet_size.cnf
@@ -1,5 +1,7 @@
 !include ../galera_2nodes.cnf
+
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcs.max_packet_size=64;gcache.size=10M'
+
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcs.max_packet_size=64;gcache.size=10M'
diff --git a/mysql-test/suite/galera/t/galera_gtid.cnf b/mysql-test/suite/galera/t/galera_gtid.cnf
index 8f6a760def0..98e724fb2d0 100644
--- a/mysql-test/suite/galera/t/galera_gtid.cnf
+++ b/mysql-test/suite/galera/t/galera_gtid.cnf
@@ -7,4 +7,3 @@ log-slave-updates
 [mysqld.2]
 log-bin
 log-slave-updates
-
diff --git a/mysql-test/suite/galera/t/galera_gtid_server_id.cnf b/mysql-test/suite/galera/t/galera_gtid_server_id.cnf
index bda7a00ab2e..76887d5c189 100644
--- a/mysql-test/suite/galera/t/galera_gtid_server_id.cnf
+++ b/mysql-test/suite/galera/t/galera_gtid_server_id.cnf
@@ -13,4 +13,3 @@ wsrep_gtid_mode=ON
 server-id=12
 log_slave_updates
 log_bin
-
diff --git a/mysql-test/suite/galera/t/galera_gtid_slave.cnf b/mysql-test/suite/galera/t/galera_gtid_slave.cnf
index 112c487851f..5d242f01707 100644
--- a/mysql-test/suite/galera/t/galera_gtid_slave.cnf
+++ b/mysql-test/suite/galera/t/galera_gtid_slave.cnf
@@ -4,13 +4,16 @@
 log-bin=mysqld-bin
 log-slave-updates
 binlog-format=ROW
+
 [mysqld.1]
 gtid-domain-id=1
 wsrep_gtid_mode=1
 wsrep_gtid_domain_id=1
+
 [mysqld.2]
 gtid-domain-id=1
 wsrep_gtid_mode=1
 wsrep_gtid_domain_id=1
+
 [mysqld.3]
 gtid-domain-id=2
diff --git a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.cnf b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.cnf
index efeb536de96..2b05acfde01 100644
--- a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.cnf
+++ b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.cnf
@@ -5,14 +5,16 @@ log-bin=mysqld-bin
 log-slave-updates
 binlog-format=ROW
 wsrep_sst_method=rsync
+
 [mysqld.1]
 gtid-domain-id=1
 wsrep_gtid_mode=1
 wsrep_gtid_domain_id=1
+
 [mysqld.2]
 gtid-domain-id=1
 wsrep_gtid_mode=1
 wsrep_gtid_domain_id=1
+
 [mysqld.3]
 gtid-domain-id=2
-
diff --git a/mysql-test/suite/galera/t/galera_gtid_trx_conflict.cnf b/mysql-test/suite/galera/t/galera_gtid_trx_conflict.cnf
index 5f129e7c168..1422f977bf7 100644
--- a/mysql-test/suite/galera/t/galera_gtid_trx_conflict.cnf
+++ b/mysql-test/suite/galera/t/galera_gtid_trx_conflict.cnf
@@ -4,10 +4,12 @@
 log-bin=mysqld-bin
 log-slave-updates
 binlog-format=ROW
+
 [mysqld.1]
 gtid-domain-id=1
 wsrep_gtid_mode=1
 wsrep_gtid_domain_id=1
+
 [mysqld.2]
 gtid-domain-id=1
 wsrep_gtid_mode=1
diff --git a/mysql-test/suite/galera/t/galera_insert_ignore.test b/mysql-test/suite/galera/t/galera_insert_ignore.test
index 027f70e96d9..4d500ab7b4e 100644
--- a/mysql-test/suite/galera/t/galera_insert_ignore.test
+++ b/mysql-test/suite/galera/t/galera_insert_ignore.test
@@ -57,4 +57,3 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 --eval SET GLOBAL wsrep_sync_wait = $wsrep_sync_wait_orig
-
diff --git a/mysql-test/suite/galera/t/galera_insert_multi.test b/mysql-test/suite/galera/t/galera_insert_multi.test
index d62283aff69..35205921283 100644
--- a/mysql-test/suite/galera/t/galera_insert_multi.test
+++ b/mysql-test/suite/galera/t/galera_insert_multi.test
@@ -113,10 +113,3 @@ SELECT COUNT(*) = 2 FROM t1;
 SELECT COUNT(*) = 2 FROM t1;
 
 DROP TABLE t1;
-
-
-
-
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_ist_progress.cnf b/mysql-test/suite/galera/t/galera_ist_progress.cnf
index b37e7f38ce3..10958aad9a8 100644
--- a/mysql-test/suite/galera/t/galera_ist_progress.cnf
+++ b/mysql-test/suite/galera/t/galera_ist_progress.cnf
@@ -2,6 +2,3 @@
 
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_ist_recv_bind.cnf b/mysql-test/suite/galera/t/galera_ist_recv_bind.cnf
index 2628f05eaef..035fb0769b7 100644
--- a/mysql-test/suite/galera/t/galera_ist_recv_bind.cnf
+++ b/mysql-test/suite/galera/t/galera_ist_recv_bind.cnf
@@ -5,4 +5,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;ist.recv_bind=127.0.0.1
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;ist.recv_bind=127.0.0.1'
-
diff --git a/mysql-test/suite/galera/t/galera_kill_applier.cnf b/mysql-test/suite/galera/t/galera_kill_applier.cnf
index 62cf1854032..18a80b22fb6 100644
--- a/mysql-test/suite/galera/t/galera_kill_applier.cnf
+++ b/mysql-test/suite/galera/t/galera_kill_applier.cnf
@@ -1,7 +1,9 @@
 !include ../galera_2nodes.cnf
 
 [mysqld.1]
+wsrep_slave_threads=1
 wsrep-debug=1
 
 [mysqld.2]
+wsrep_slave_threads=1
 wsrep-debug=1
diff --git a/mysql-test/suite/galera/t/galera_load_data.test b/mysql-test/suite/galera/t/galera_load_data.test
index 252580f9426..24cd55c4ae0 100644
--- a/mysql-test/suite/galera/t/galera_load_data.test
+++ b/mysql-test/suite/galera/t/galera_load_data.test
@@ -397,4 +397,3 @@ SELECT data_length from information_schema.tables WHERE TABLE_NAME = 'cardtest_t
 --connection node_1
 use test;
 drop database cardtest02;
-
diff --git a/mysql-test/suite/galera/t/galera_mdev_13787.cnf b/mysql-test/suite/galera/t/galera_mdev_13787.cnf
index ada78e1db2a..5f954d5ccba 100644
--- a/mysql-test/suite/galera/t/galera_mdev_13787.cnf
+++ b/mysql-test/suite/galera/t/galera_mdev_13787.cnf
@@ -5,5 +5,3 @@ innodb-stats-persistent=1
 
 [mysqld.2]
 innodb-stats-persistent=1
-
-
diff --git a/mysql-test/suite/galera/t/galera_mdev_13787.test b/mysql-test/suite/galera/t/galera_mdev_13787.test
index 940cffb8b65..458d7f1d5d4 100644
--- a/mysql-test/suite/galera/t/galera_mdev_13787.test
+++ b/mysql-test/suite/galera/t/galera_mdev_13787.test
@@ -1,5 +1,6 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
+
 --connection node_1
 create table t(a int);
 insert into t select 1;
diff --git a/mysql-test/suite/galera/t/galera_mdev_15611.cnf b/mysql-test/suite/galera/t/galera_mdev_15611.cnf
index b6f601c56b1..1d9f793beff 100644
--- a/mysql-test/suite/galera/t/galera_mdev_15611.cnf
+++ b/mysql-test/suite/galera/t/galera_mdev_15611.cnf
@@ -1,4 +1,5 @@
 !include ../galera_2nodes.cnf
+
 [mysqld.1]
 
 [mysqld.2]
diff --git a/mysql-test/suite/galera/t/galera_mdl_race.test b/mysql-test/suite/galera/t/galera_mdl_race.test
index 3341a3792f1..9d6babea0b3 100644
--- a/mysql-test/suite/galera/t/galera_mdl_race.test
+++ b/mysql-test/suite/galera/t/galera_mdl_race.test
@@ -91,4 +91,3 @@ SET DEBUG_SYNC = "RESET";
 --disconnect node_1a
 --disconnect node_1b
 --disconnect node_1c
-
diff --git a/mysql-test/suite/galera/t/galera_nonPK_and_PA.test b/mysql-test/suite/galera/t/galera_nonPK_and_PA.test
index 8a5173f576b..dbd516e9b31 100644
--- a/mysql-test/suite/galera/t/galera_nonPK_and_PA.test
+++ b/mysql-test/suite/galera/t/galera_nonPK_and_PA.test
@@ -164,5 +164,6 @@ SET GLOBAL wsrep_slave_threads = DEFAULT;
 
 DROP TABLE t1;
 DROP TABLE t2;
+
 --connection node_2
 SET GLOBAL wsrep_slave_threads = DEFAULT;
diff --git a/mysql-test/suite/galera/t/galera_nopk_unicode.test b/mysql-test/suite/galera/t/galera_nopk_unicode.test
index e036e14ebe0..8e98f1e5e47 100644
--- a/mysql-test/suite/galera/t/galera_nopk_unicode.test
+++ b/mysql-test/suite/galera/t/galera_nopk_unicode.test
@@ -39,5 +39,4 @@ COMMIT;
 SELECT f1 = 'текст2' FROM t1;
 SELECT f1 = 'текст2' FROM t1 WHERE f1 = 'текст2';
 
-
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_parallel_apply_lock_table.test b/mysql-test/suite/galera/t/galera_parallel_apply_lock_table.test
index 2e9f05cb4af..52226850532 100644
--- a/mysql-test/suite/galera/t/galera_parallel_apply_lock_table.test
+++ b/mysql-test/suite/galera/t/galera_parallel_apply_lock_table.test
@@ -29,11 +29,13 @@ INSERT INTO t2 VALUES (1);
 --let $galera_connection_name = node_2a
 --let $galera_server_number = 2
 --source include/galera_connect.inc
+
 --connection node_2a
 --sleep 1
 SET SESSION wsrep_sync_wait=0;
-SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committing%' or STATE = 'Waiting for certification');
-SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%Waiting for table metadata lock%';
+SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification');
+SELECT COUNT(*) AS EXPECT_1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
+
 SELECT COUNT(*) AS EXPECT_0 FROM t1;
 SELECT COUNT(*) AS EXPECT_0 FROM t2;
 
@@ -44,8 +46,11 @@ UNLOCK TABLES;
 --eval SET SESSION wsrep_sync_wait = $wsrep_sync_wait_orig;
 SELECT COUNT(*) AS EXPECT_1 FROM t1;
 SELECT COUNT(*) AS EXPECT_1 FROM t2;
-SELECT COUNT(*) AS EXPECT_2  FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committed%' or STATE = 'Waiting for certification');
+SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committed%' OR STATE LIKE 'Waiting for certification');
 
+--disable_query_log
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
+--enable_query_log
+
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test b/mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test
index df0200fab55..f7d1c2c1e62 100644
--- a/mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test
+++ b/mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test
@@ -67,4 +67,3 @@ SELECT COUNT(DISTINCT f1) AS  EXPECT_30000 FROM t1;
 --connection default
 DROP TABLE t1;
 DROP TABLE ten;
-
diff --git a/mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test b/mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test
index 587fbe10fe4..a3e2f249e2f 100644
--- a/mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test
+++ b/mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test
@@ -91,5 +91,3 @@ SELECT COUNT(DISTINCT f1) FROM t1;
 DROP TABLE t1;
 DROP TABLE ten;
 DROP PROCEDURE p1;
-
-
diff --git a/mysql-test/suite/galera/t/galera_parallel_simple.test b/mysql-test/suite/galera/t/galera_parallel_simple.test
index a305473dbbb..074af301671 100644
--- a/mysql-test/suite/galera/t/galera_parallel_simple.test
+++ b/mysql-test/suite/galera/t/galera_parallel_simple.test
@@ -48,10 +48,10 @@ INSERT INTO t2 select * from t2;
 --connection node_2
 SET SESSION wsrep_sync_wait = 0;
 
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%';
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%');
 --source include/wait_condition.inc
 
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE '%committing%' or STATE = 'Waiting for certification');
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committing%' OR STATE LIKE 'Commit' OR STATE LIKE 'Waiting for certification');
 --source include/wait_condition.inc
 
 UNLOCK TABLES;
@@ -61,7 +61,9 @@ SET SESSION wsrep_sync_wait = 15;
 SELECT COUNT(*) as expect_20 FROM t1;
 SELECT COUNT(*) as expect_20 FROM t2;
 
+--disable_query_log
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
+--enable_query_log
 
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.cnf b/mysql-test/suite/galera/t/galera_pc_ignore_sb.cnf
index ae48aa3ae0f..8734323a2d6 100644
--- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.cnf
+++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.cnf
@@ -8,4 +8,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true'
-
diff --git a/mysql-test/suite/galera/t/galera_query_cache.cnf b/mysql-test/suite/galera/t/galera_query_cache.cnf
index 80f40b0997e..5f37e357a52 100644
--- a/mysql-test/suite/galera/t/galera_query_cache.cnf
+++ b/mysql-test/suite/galera/t/galera_query_cache.cnf
@@ -7,4 +7,3 @@ query_cache_size=1355776
 [mysqld.2]
 query_cache_type=1
 query_cache_size=1355776
-
diff --git a/mysql-test/suite/galera/t/galera_query_cache_sync_wait.cnf b/mysql-test/suite/galera/t/galera_query_cache_sync_wait.cnf
index 80f40b0997e..5f37e357a52 100644
--- a/mysql-test/suite/galera/t/galera_query_cache_sync_wait.cnf
+++ b/mysql-test/suite/galera/t/galera_query_cache_sync_wait.cnf
@@ -7,4 +7,3 @@ query_cache_size=1355776
 [mysqld.2]
 query_cache_type=1
 query_cache_size=1355776
-
diff --git a/mysql-test/suite/galera/t/galera_repl_key_format_flat16.test b/mysql-test/suite/galera/t/galera_repl_key_format_flat16.test
index 8749c20faed..5d12ad1c1c4 100644
--- a/mysql-test/suite/galera/t/galera_repl_key_format_flat16.test
+++ b/mysql-test/suite/galera/t/galera_repl_key_format_flat16.test
@@ -25,7 +25,6 @@ UPDATE t2 SET f1 = REPEAT('b', 256);
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 234;
 SELECT COUNT(*) = 1 FROM t2 WHERE f1 = REPEAT('b', 256);
 
-
 --disable_query_log
 --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig';
 --enable_query_log
diff --git a/mysql-test/suite/galera/t/galera_restart_nochanges.test b/mysql-test/suite/galera/t/galera_restart_nochanges.test
index 0a6a0c5ccbe..8ca80649d3f 100644
--- a/mysql-test/suite/galera/t/galera_restart_nochanges.test
+++ b/mysql-test/suite/galera/t/galera_restart_nochanges.test
@@ -37,4 +37,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_restart_replica.cnf b/mysql-test/suite/galera/t/galera_restart_replica.cnf
index 6713e301527..cb2a7998ec6 100644
--- a/mysql-test/suite/galera/t/galera_restart_replica.cnf
+++ b/mysql-test/suite/galera/t/galera_restart_replica.cnf
@@ -17,4 +17,3 @@ wsrep_gtid_mode=1
 wsrep_gtid_domain_id=16
 gtid_domain_id=11
 gtid_strict_mode=1
-
diff --git a/mysql-test/suite/galera/t/galera_savepoint_replay.test b/mysql-test/suite/galera/t/galera_savepoint_replay.test
index cff26f4a94f..d8b04847a2b 100644
--- a/mysql-test/suite/galera/t/galera_savepoint_replay.test
+++ b/mysql-test/suite/galera/t/galera_savepoint_replay.test
@@ -83,4 +83,3 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'b';
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera/t/galera_server.test b/mysql-test/suite/galera/t/galera_server.test
index 30b39028b96..36687402d4e 100644
--- a/mysql-test/suite/galera/t/galera_server.test
+++ b/mysql-test/suite/galera/t/galera_server.test
@@ -25,4 +25,3 @@ SELECT COUNT(*)=0 FROM mysql.servers;
 
 --source include/galera_end.inc
 --echo # End of test
-
diff --git a/mysql-test/suite/galera/t/galera_set_position_after_cert_failure.test b/mysql-test/suite/galera/t/galera_set_position_after_cert_failure.test
index 4dfddb0f32a..a7f26e28aca 100644
--- a/mysql-test/suite/galera/t/galera_set_position_after_cert_failure.test
+++ b/mysql-test/suite/galera/t/galera_set_position_after_cert_failure.test
@@ -95,4 +95,5 @@ if ($galera_wsrep_start_position != $expected_position)
 --connection node_1
 DROP TABLE t1;
 SET GLOBAL wsrep_slave_threads = DEFAULT;
+
 --source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_sp_bf_abort.inc b/mysql-test/suite/galera/t/galera_sp_bf_abort.inc
index 58345184e98..a3c8c16209d 100644
--- a/mysql-test/suite/galera/t/galera_sp_bf_abort.inc
+++ b/mysql-test/suite/galera/t/galera_sp_bf_abort.inc
@@ -35,4 +35,3 @@
 --source include/galera_signal_sync_point.inc
 --let $galera_sync_point = after_replicate_sync
 --source include/galera_signal_sync_point.inc
-
diff --git a/mysql-test/suite/galera/t/galera_sql_log_bin_zero.test b/mysql-test/suite/galera/t/galera_sql_log_bin_zero.test
index cd8d6ba6426..c8c46b25e1c 100644
--- a/mysql-test/suite/galera/t/galera_sql_log_bin_zero.test
+++ b/mysql-test/suite/galera/t/galera_sql_log_bin_zero.test
@@ -17,7 +17,6 @@ SET SESSION sql_log_bin = 1;
 
 INSERT INTO t1 VALUES (2);
 
-
 --connection node_2
 SELECT COUNT(*) = 2 FROM t1;
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 1;
diff --git a/mysql-test/suite/galera/t/galera_status_cluster.test b/mysql-test/suite/galera/t/galera_status_cluster.test
index 3299613d584..0c2260321e9 100644
--- a/mysql-test/suite/galera/t/galera_status_cluster.test
+++ b/mysql-test/suite/galera/t/galera_status_cluster.test
@@ -14,5 +14,3 @@ SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VA
 
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
-
-
diff --git a/mysql-test/suite/galera/t/galera_status_local_index.test b/mysql-test/suite/galera/t/galera_status_local_index.test
index b61b8ced863..3e15911537a 100644
--- a/mysql-test/suite/galera/t/galera_status_local_index.test
+++ b/mysql-test/suite/galera/t/galera_status_local_index.test
@@ -12,7 +12,6 @@ INSERT INTO wsrep_local_indexes VALUES ((SELECT variable_value FROM INFORMATION_
 --connection node_2
 INSERT INTO wsrep_local_indexes VALUES ((SELECT variable_value FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_local_index'));
 
-
 --connection node_1
 SELECT COUNT(*) = 2 FROM wsrep_local_indexes;
 SELECT COUNT(DISTINCT wsrep_local_index) = 2 FROM wsrep_local_indexes;
diff --git a/mysql-test/suite/galera/t/galera_status_local_state.test b/mysql-test/suite/galera/t/galera_status_local_state.test
index 09cdb25f80c..6401c32082f 100644
--- a/mysql-test/suite/galera/t/galera_status_local_state.test
+++ b/mysql-test/suite/galera/t/galera_status_local_state.test
@@ -22,7 +22,3 @@ SET GLOBAL wsrep_desync = 0;
 --source include/wait_condition.inc
 
 SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
-
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_suspend_slave.test b/mysql-test/suite/galera/t/galera_suspend_slave.test
index 0f95bcd4531..9a238e59f30 100644
--- a/mysql-test/suite/galera/t/galera_suspend_slave.test
+++ b/mysql-test/suite/galera/t/galera_suspend_slave.test
@@ -67,4 +67,3 @@ DROP TABLE t1;
 # Restore original auto_increment_offset values.
 --let $node_2=node_2a
 --source include/auto_increment_offset_restore.inc
-
diff --git a/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt b/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt
index 0b35236062b..93b3d5bfdaf 100644
--- a/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt
+++ b/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt
@@ -1 +1 @@
---wsrep-sync-wait=0 --wsrep-causal-reads=OFF
\ No newline at end of file
+--wsrep-sync-wait=0 --wsrep-causal-reads=OFF
diff --git a/mysql-test/suite/galera/t/galera_table_with_hyphen.inc b/mysql-test/suite/galera/t/galera_table_with_hyphen.inc
index ac79d864e82..f53a08cd401 100644
--- a/mysql-test/suite/galera/t/galera_table_with_hyphen.inc
+++ b/mysql-test/suite/galera/t/galera_table_with_hyphen.inc
@@ -45,4 +45,3 @@ SET GLOBAL wsrep_slave_threads=DEFAULT;
 --connection node_2
 --eval drop table `$fk_child`
 --eval drop table `$fk_parent`
-
diff --git a/mysql-test/suite/galera/t/galera_temporary_sequences.test b/mysql-test/suite/galera/t/galera_temporary_sequences.test
index c46c4243514..a85124950af 100644
--- a/mysql-test/suite/galera/t/galera_temporary_sequences.test
+++ b/mysql-test/suite/galera/t/galera_temporary_sequences.test
@@ -30,7 +30,6 @@ SELECT * FROM t;
 SHOW CREATE TABLE seq1;
 SHOW CREATE TABLE seq2;
 
-
 --connection node_1
 DROP TABLE t;
 DROP SEQUENCE seq1;
diff --git a/mysql-test/suite/galera/t/galera_threadpool.cnf b/mysql-test/suite/galera/t/galera_threadpool.cnf
index c1a1e6a81aa..0ef20a3abb9 100644
--- a/mysql-test/suite/galera/t/galera_threadpool.cnf
+++ b/mysql-test/suite/galera/t/galera_threadpool.cnf
@@ -13,5 +13,3 @@ log_bin=binlog
 log_slave_updates=ON
 wsrep_sst_method=rsync
 thread_handling = pool-of-threads
-
-
diff --git a/mysql-test/suite/galera/t/galera_toi_ftwrl.test b/mysql-test/suite/galera/t/galera_toi_ftwrl.test
index 4d0edefda8e..25a3de20847 100644
--- a/mysql-test/suite/galera/t/galera_toi_ftwrl.test
+++ b/mysql-test/suite/galera/t/galera_toi_ftwrl.test
@@ -19,4 +19,3 @@ UNLOCK TABLES;
 SHOW CREATE TABLE t1;
 
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera/t/galera_transaction_read_only.test b/mysql-test/suite/galera/t/galera_transaction_read_only.test
index 386d73fd3ca..65c65deda45 100644
--- a/mysql-test/suite/galera/t/galera_transaction_read_only.test
+++ b/mysql-test/suite/galera/t/galera_transaction_read_only.test
@@ -55,4 +55,3 @@ COMMIT;
 --enable_query_log
 
 DROP TABLE t1;
-
diff --git a/mysql-test/suite/galera/t/galera_udf.cnf b/mysql-test/suite/galera/t/galera_udf.cnf
index 69d5acd65f3..16477960835 100644
--- a/mysql-test/suite/galera/t/galera_udf.cnf
+++ b/mysql-test/suite/galera/t/galera_udf.cnf
@@ -6,10 +6,3 @@ query_cache_type=1
 
 [mysqld.2]
 query_cache_type=1
-
-
-
-
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_unicode_identifiers.test b/mysql-test/suite/galera/t/galera_unicode_identifiers.test
index c0c95768650..79f6a72cfdc 100644
--- a/mysql-test/suite/galera/t/galera_unicode_identifiers.test
+++ b/mysql-test/suite/galera/t/galera_unicode_identifiers.test
@@ -75,4 +75,3 @@ DROP DATABASE `database with space`;
 DROP DATABASE `база`;
 DROP DATABASE `втора база`;
 --eval SET GLOBAL wsrep_sync_wait = $wsrep_sync_wait_orig
-
diff --git a/mysql-test/suite/galera/t/galera_v1_row_events.cnf b/mysql-test/suite/galera/t/galera_v1_row_events.cnf
index b95e321ad4f..cfb3782832b 100644
--- a/mysql-test/suite/galera/t/galera_v1_row_events.cnf
+++ b/mysql-test/suite/galera/t/galera_v1_row_events.cnf
@@ -4,10 +4,3 @@
 log-bin-use-v1-row-events=1
 
 [mysqld.2]
-
-
-
-
-
-
-
diff --git a/mysql-test/suite/galera/t/galera_var_OSU_method2.test b/mysql-test/suite/galera/t/galera_var_OSU_method2.test
index 099e2cc6612..5117f87b647 100644
--- a/mysql-test/suite/galera/t/galera_var_OSU_method2.test
+++ b/mysql-test/suite/galera/t/galera_var_OSU_method2.test
@@ -44,4 +44,3 @@ SET DEBUG_SYNC= 'RESET';
 
 --connection node_1a
 SET DEBUG_SYNC= 'RESET';
-
diff --git a/mysql-test/suite/galera/t/galera_var_auto_inc_control_on.cnf b/mysql-test/suite/galera/t/galera_var_auto_inc_control_on.cnf
index 523bae68763..25da46fc009 100644
--- a/mysql-test/suite/galera/t/galera_var_auto_inc_control_on.cnf
+++ b/mysql-test/suite/galera/t/galera_var_auto_inc_control_on.cnf
@@ -5,9 +5,3 @@ wsrep-auto-increment-control=ON
 
 [mysqld.2]
 wsrep-auto-increment-control=ON
-
-
-
-
-
-
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 66909baff07..1a3a038a971 100644
--- a/mysql-test/suite/galera/t/galera_var_slave_threads.test
+++ b/mysql-test/suite/galera/t/galera_var_slave_threads.test
@@ -15,11 +15,15 @@
 
 --connection node_1
 --let $wsrep_slave_threads_orig = `SELECT @@wsrep_slave_threads`
+
 CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB;
 CREATE TABLE t2 (f1 INT AUTO_INCREMENT PRIMARY KEY) Engine=InnoDB;
 
 --connection node_2
+--let $wsrep_slave_threads_orig_2 = `SELECT @@wsrep_slave_threads`
+
 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;
@@ -74,7 +78,9 @@ SELECT COUNT(*) FROM t2;
 --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count';
 --source include/wait_condition.inc
 
---eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig
+--disable_query_log
+--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig_2;
+--enable_query_log
 
 DROP TABLE t1;
 DROP TABLE t2;
@@ -94,6 +100,11 @@ SET GLOBAL wsrep_slave_threads = 4;
 SET GLOBAL wsrep_slave_threads = 1;
 
 --connection node_1
+
+--disable_query_log
+--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
+--enable_query_log
+
 INSERT INTO t1 VALUES (DEFAULT);
 INSERT INTO t1 VALUES (DEFAULT);
 INSERT INTO t1 VALUES (DEFAULT);
@@ -106,6 +117,10 @@ DROP TABLE t1;
 
 --connection node_2
 
+--disable_query_log
+--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig_2;
+--enable_query_log
+
 # Wait until above DDL is replicated
 #
 # make sure that we are left with exactly one applier thread before we leaving the test
diff --git a/mysql-test/suite/galera/t/galera_wan_restart_sst.cnf b/mysql-test/suite/galera/t/galera_wan_restart_sst.cnf
index 202aa4ce1c8..f549aeedf30 100644
--- a/mysql-test/suite/galera/t/galera_wan_restart_sst.cnf
+++ b/mysql-test/suite/galera/t/galera_wan_restart_sst.cnf
@@ -14,4 +14,3 @@ wsrep_provider_options='base_port=@mysqld.3.#galera_port;gmcast.segment=2'
 
 [mysqld.4]
 wsrep_provider_options='base_port=@mysqld.4.#galera_port;gmcast.segment=2'
-
diff --git a/mysql-test/suite/galera/t/galera_wsrep_log_conficts.cnf b/mysql-test/suite/galera/t/galera_wsrep_log_conficts.cnf
index 440c37bea81..db7e2bd973c 100644
--- a/mysql-test/suite/galera/t/galera_wsrep_log_conficts.cnf
+++ b/mysql-test/suite/galera/t/galera_wsrep_log_conficts.cnf
@@ -5,8 +5,3 @@ wsrep_log_conflicts=ON
 
 [mysqld.2]
 wsrep_log_conflicts=ON
-
-
-
-
-
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 c70dede09a3..5cfcffce475 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
@@ -3,6 +3,7 @@
 #
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
+
 --let LOGF=$MYSQLTEST_VARDIR/log/mysqld.1.err
 --disable_info
 call mtr.add_suppression("WSREP: Unknown parameter 'gmcasts\\.segment'");
diff --git a/mysql-test/suite/galera/t/mdev-31285.test b/mysql-test/suite/galera/t/mdev-31285.test
index 5abef37cccd..3e5f5a48cf5 100644
--- a/mysql-test/suite/galera/t/mdev-31285.test
+++ b/mysql-test/suite/galera/t/mdev-31285.test
@@ -11,5 +11,3 @@ CREATE TABLE t ENGINE=InnoDB WITH SYSTEM VERSIONING AS SELECT 1 AS i;
 --connection node_2
 --error ER_NO_SUCH_TABLE
 SHOW CREATE TABLE t;
-
-
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#198.cnf b/mysql-test/suite/galera/t/mysql-wsrep#198.cnf
index bbeb0e31c31..4c62448fe3d 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#198.cnf
+++ b/mysql-test/suite/galera/t/mysql-wsrep#198.cnf
@@ -2,5 +2,3 @@
 
 [mysqld]
 log-bin
-wsrep-debug=1
-loose-mysql-wsrep198=1
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#198.test b/mysql-test/suite/galera/t/mysql-wsrep#198.test
index aba05ed8bf9..dceae6e17e9 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#198.test
+++ b/mysql-test/suite/galera/t/mysql-wsrep#198.test
@@ -1,6 +1,5 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
---source include/force_restart.inc
 
 CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB;
@@ -21,7 +20,7 @@ LOCK TABLE t2 WRITE;
 
 --connection node_2
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Waiting for table metadata lock'
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%' OR STATE LIKE 'Waiting to execute in isolation%';
 --let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 --source include/wait_condition_with_debug_and_kill.inc
 
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#201.cnf b/mysql-test/suite/galera/t/mysql-wsrep#201.cnf
index 4a82e9fa037..bea5b606e3e 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#201.cnf
+++ b/mysql-test/suite/galera/t/mysql-wsrep#201.cnf
@@ -5,5 +5,3 @@ query_cache_type=1
 
 [mysqld.2]
 query_cache_type=1
-
-
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#247.test b/mysql-test/suite/galera/t/mysql-wsrep#247.test
index 8bcd58607a1..2f348029407 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#247.test
+++ b/mysql-test/suite/galera/t/mysql-wsrep#247.test
@@ -20,4 +20,3 @@ SET GLOBAL wsrep_desync=0;
 --sleep 1
 DROP TABLE t1;
 SHOW VARIABLES LIKE 'wsrep_desync';
-
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#31.test b/mysql-test/suite/galera/t/mysql-wsrep#31.test
index c669d4834ba..1924bc4a11c 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#31.test
+++ b/mysql-test/suite/galera/t/mysql-wsrep#31.test
@@ -49,5 +49,3 @@ DROP DATABASE db;
 --source include/auto_increment_offset_restore.inc
 
 --source include/galera_end.inc
-
-
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#33.cnf b/mysql-test/suite/galera/t/mysql-wsrep#33.cnf
index f1c3d802e4b..f1d42cd791f 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#33.cnf
+++ b/mysql-test/suite/galera/t/mysql-wsrep#33.cnf
@@ -5,4 +5,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true'
-
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#332.test b/mysql-test/suite/galera/t/mysql-wsrep#332.test
index 464156e832e..dcbbca89f25 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#332.test
+++ b/mysql-test/suite/galera/t/mysql-wsrep#332.test
@@ -216,4 +216,3 @@ SELECT * FROM c;
 DROP TABLE c;
 DROP TABLE p1;
 DROP TABLE p2;
-
diff --git a/mysql-test/suite/galera/t/rename.test b/mysql-test/suite/galera/t/rename.test
index 326d64d3b8a..b56caa1531f 100644
--- a/mysql-test/suite/galera/t/rename.test
+++ b/mysql-test/suite/galera/t/rename.test
@@ -50,4 +50,3 @@ DROP USER foo@localhost;
 DROP TABLE t2;
 
 --echo # End of tests
-
diff --git a/mysql-test/suite/galera/t/view.test b/mysql-test/suite/galera/t/view.test
index fa2cd8b2a67..a6f94941ba0 100644
--- a/mysql-test/suite/galera/t/view.test
+++ b/mysql-test/suite/galera/t/view.test
@@ -47,4 +47,3 @@ DROP VIEW v1, v2, v3, v4;
 DROP TABLE t1;
 
 --echo # End of tests
-
diff --git a/mysql-test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result b/mysql-test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result
index 087f9e7e279..a38e14c40a2 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result
@@ -26,7 +26,7 @@ connection node_3;
 SELECT f1 = 111 FROM t1;
 f1 = 111
 1
-SELECT COUNT(*) IN (1, 2) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%committed%';
+SELECT COUNT(*) IN (1, 2) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committed%' OR STATE LIKE 'Waiting for certification');
 COUNT(*) IN (1, 2)
 1
 SET GLOBAL wsrep_slave_threads = DEFAULT;
diff --git a/mysql-test/suite/galera_3nodes/suite.pm b/mysql-test/suite/galera_3nodes/suite.pm
index ff1ba0a566f..9f45e22d459 100644
--- a/mysql-test/suite/galera_3nodes/suite.pm
+++ b/mysql-test/suite/galera_3nodes/suite.pm
@@ -10,58 +10,58 @@ 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: Could not open saved state file for reading: .*),
-     qr(WSREP: Could not open state file for reading: .*),
+     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: 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: Releasing seqno [0-9]* before [0-9]* was assigned\.),
-     qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
+     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: 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: 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: 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: Maximum writeset size exceeded by .*),
-     qr(WSREP: transaction size exceeded.*),
-     qr(WSREP: RBR event .*),
-     qr(WSREP: Ignoring error for TO isolated action: .*),
-     qr(WSREP: transaction size limit .*),
-     qr(WSREP: rbr write fail, .*),
-     qr(WSREP: .*Backend not supported: foo.*),
-     qr(WSREP: .*Failed to initialize backend using .*),
-     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: Maximum writeset size exceeded by ),
+     qr(WSREP: transaction size exceeded),
+     qr(WSREP: RBR event ),
+     qr(WSREP: Ignoring error for TO isolated action: ),
+     qr(WSREP: transaction size limit ),
+     qr(WSREP: rbr write fail, ),
+     qr(WSREP: .*Backend not supported: foo),
+     qr(WSREP: .*Failed to initialize backend using ),
+     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at ),
      qr(WSREP: gcs connect failed: Socket type not supported),
      qr(WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 .*),
-     qr(WSREP: .*Failed to open backend connection: -110 .*),
-     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: .*Failed to open backend connection: -110 ),
+     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: 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: 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: 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: 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: .*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: .*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: Trying to continue unpaused monitor|,
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 0effe780a22..a9f96ddce7c 100644
--- a/mysql-test/suite/galera_3nodes/t/galera-features#119.test
+++ b/mysql-test/suite/galera_3nodes/t/galera-features#119.test
@@ -66,6 +66,5 @@ 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: 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_certification_ccc.test b/mysql-test/suite/galera_3nodes/t/galera_certification_ccc.test
index b4fe10bff0d..e5646d98427 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_certification_ccc.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_certification_ccc.test
@@ -50,4 +50,3 @@ DROP TABLE t1;
 --source ../galera/include/auto_increment_offset_restore.inc
 
 --source include/galera_end.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 c52bebc7019..c36cce61f23 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
@@ -87,5 +87,6 @@ SELECT COUNT(*) FROM t1;
 --source include/wait_condition.inc
 
 DROP TABLE t1;
+
 # Restore original auto_increment_offset values.
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes/t/galera_parallel_apply_3nodes.test b/mysql-test/suite/galera_3nodes/t/galera_parallel_apply_3nodes.test
index 84629c96c65..61708f7ec6c 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_parallel_apply_3nodes.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_parallel_apply_3nodes.test
@@ -65,7 +65,7 @@ SET DEBUG_SYNC = 'now SIGNAL wsrep_retry_autocommit_continue';
 
 --connection node_3
 SELECT f1 = 111 FROM t1;
-SELECT COUNT(*) IN (1, 2) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%committed%';
+SELECT COUNT(*) IN (1, 2) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE LIKE '%committed%' OR STATE LIKE 'Waiting for certification');
 
 SET GLOBAL wsrep_slave_threads = DEFAULT;
 
diff --git a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema_init.test b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema_init.test
index 7d8089a8ceb..9b0b5599709 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema_init.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema_init.test
@@ -55,4 +55,3 @@ SELECT node_incoming_address LIKE '127.0.0.1:%' from mysql.wsrep_cluster_members
 SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster_members;
 
 --source ../galera/include/auto_increment_offset_restore.inc
-
diff --git a/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.cnf b/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.cnf
index ae2cf8068f5..340fe700e2b 100644
--- a/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.cnf
+++ b/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.cnf
@@ -5,5 +5,4 @@ wsrep-slave-threads=8
 wsrep-ignore-apply-errors=0
 
 [ENV]
-galera_cluster_size = 3
-
+galera_cluster_size=3
diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result
index 08e3fc6c3e3..404e909e956 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result
@@ -44,7 +44,7 @@ connection node_2;
 SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
 EXPECT_0
 0
-call mtr.add_suppression("WSREP: node uuid:.*");
+call mtr.add_suppression("WSREP: node uuid:");
 connection node_1;
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera_3nodes_sr/suite.pm b/mysql-test/suite/galera_3nodes_sr/suite.pm
index d2b31a0fbc7..3cc7af0666c 100644
--- a/mysql-test/suite/galera_3nodes_sr/suite.pm
+++ b/mysql-test/suite/galera_3nodes_sr/suite.pm
@@ -10,37 +10,37 @@ 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: 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: 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: 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: SQL statement was ineffective),
-     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: 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: 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: 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: 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: Could not find peer:),
-     qr|WSREP: gcs_caused\(\) returned .*|,
+     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: 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: .*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: Sending JOIN failed: -107 \(Transport endpoint is not connected\)\. Will retry in new primary component\.|,
    );
 
 bless { };
diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-606.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-606.test
index 879c007e601..2048580d735 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-606.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-606.test
@@ -85,4 +85,5 @@ DROP TABLE t1;
 
 --connection node_2
 CALL mtr.add_suppression("WSREP: failed to send SR rollback for ");
+
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback2.test b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback2.test
index 6ca2011d221..4dba60ba79d 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback2.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback2.test
@@ -65,4 +65,5 @@ SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 --connection node_1
 --disconnect node_1a
 DROP TABLE t1;
+
 --source ../galera/include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_before_apply.test b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_before_apply.test
index 58d744e704d..b6355050836 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_before_apply.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_before_apply.test
@@ -88,7 +88,7 @@ SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
 --connection node_2
 SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
 # As noted above sometimes node delivers the same view twice
-call mtr.add_suppression("WSREP: node uuid:.*");
+call mtr.add_suppression("WSREP: node uuid:");
 
 --connection node_1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.cnf b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.cnf
index 910d945949a..557edbb09d9 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.cnf
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.cnf
@@ -2,4 +2,3 @@
 
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.weight=3'
-
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_vote_sr-master.opt b/mysql-test/suite/galera_3nodes_sr/t/galera_vote_sr-master.opt
index 196498bb9fa..954aacb818b 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_vote_sr-master.opt
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_vote_sr-master.opt
@@ -1,2 +1 @@
 --wsrep-ignore-apply-errors=0
-
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 433cfa4e459..de8d2bd7e7c 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
@@ -1,6 +1,6 @@
 connection node_2;
 connection node_1;
-CALL mtr.add_suppression("WSREP: discarding established.*");
+CALL mtr.add_suppression("WSREP: discarding established");
 connection node_1;
 connection node_2;
 connection node_2;
diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result
index 98bf13e9d2b..a97c004999d 100644
--- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result
+++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result
@@ -25,7 +25,7 @@ COMMIT;
 connection node_1;
 Got one of the listed errors
 connection node_2;
-SET GLOBAL wsrep_slave_threads = 1;
+SET GLOBAL wsrep_slave_threads = DEFAULT;
 SET GLOBAL debug_dbug = '';
 SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
 SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
diff --git a/mysql-test/suite/galera_sr/suite.pm b/mysql-test/suite/galera_sr/suite.pm
index 1a0e9b28685..f60ad1eefe3 100644
--- a/mysql-test/suite/galera_sr/suite.pm
+++ b/mysql-test/suite/galera_sr/suite.pm
@@ -10,58 +10,58 @@ 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: Could not open saved state file for reading: .*),
-     qr(WSREP: Could not open state file for reading: .*),
+     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: 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: Releasing seqno [0-9]* before [0-9]* was assigned\.),
-     qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
+     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: 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: 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: 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: Maximum writeset size exceeded by .*),
-     qr(WSREP: transaction size exceeded.*),
-     qr(WSREP: RBR event .*),
-     qr(WSREP: Ignoring error for TO isolated action: .*),
-     qr(WSREP: transaction size limit .*),
-     qr(WSREP: rbr write fail, .*),
-     qr(WSREP: .*Backend not supported: foo.*),
-     qr(WSREP: .*Failed to initialize backend using .*),
-     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: Maximum writeset size exceeded by ),
+     qr(WSREP: transaction size exceeded),
+     qr(WSREP: RBR event ),
+     qr(WSREP: Ignoring error for TO isolated action: ),
+     qr(WSREP: transaction size limit ),
+     qr(WSREP: rbr write fail, ),
+     qr(WSREP: .*Backend not supported: foo),
+     qr(WSREP: .*Failed to initialize backend using ),
+     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at ),
      qr(WSREP: gcs connect failed: Socket type not supported),
      qr(WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 .*),
-     qr(WSREP: .*Failed to open backend connection: -110 .*),
-     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: .*Failed to open backend connection: -110 ),
+     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: 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: 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: 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: 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: .*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: .*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: Trying to continue unpaused monitor|,
diff --git a/mysql-test/suite/galera_sr/t/MDEV-27615.test b/mysql-test/suite/galera_sr/t/MDEV-27615.test
index 8cc425aa7e1..50076f23b41 100644
--- a/mysql-test/suite/galera_sr/t/MDEV-27615.test
+++ b/mysql-test/suite/galera_sr/t/MDEV-27615.test
@@ -69,5 +69,4 @@ SET DEBUG_SYNC = 'RESET';
 --disconnect node_2
 --connect node_2, 127.0.0.1, root, , test, $NODE_MYPORT_2
 
-
 --source suite/galera/include/auto_increment_offset_restore.inc
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 563f115ecf1..b0d5853ac69 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
@@ -7,7 +7,7 @@
 # leave the cluster.
 #
 
-CALL mtr.add_suppression("WSREP: discarding established.*");
+CALL mtr.add_suppression("WSREP: discarding established");
 
 # Save original auto_increment_offset values.
 --let $node_1=node_1
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_gtid-master.opt b/mysql-test/suite/galera_sr/t/galera_sr_gtid-master.opt
index 6623c33c484..2c3adba1eee 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_gtid-master.opt
+++ b/mysql-test/suite/galera_sr/t/galera_sr_gtid-master.opt
@@ -1 +1 @@
- --log-bin --log-slave-updates --loose-galera-sr-gtid-unique
+--log-bin --log-slave-updates --loose-galera-sr-gtid-unique
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.cnf b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.cnf
index 574ae28b54a..a4edaf98802 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.cnf
+++ b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.cnf
@@ -8,4 +8,3 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true'
-
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_small_gcache.cnf b/mysql-test/suite/galera_sr/t/galera_sr_small_gcache.cnf
index c8e17436e71..8f9e053487f 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_small_gcache.cnf
+++ b/mysql-test/suite/galera_sr/t/galera_sr_small_gcache.cnf
@@ -1,6 +1,7 @@
 !include ../galera_2nodes.cnf
+
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=16K'
+
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=16K'
-
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#14.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#14.test
index deeb890fa0b..2f1e0920f0c 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#14.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#14.test
@@ -18,4 +18,3 @@ DROP TABLE t1;
 
 --connection node_2
 --source include/galera_wait_ready.inc
-
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#148.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#148.test
index e0a443061df..7689fac802e 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#148.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#148.test
@@ -47,7 +47,7 @@ COMMIT;
 --reap
 
 --connection node_2
-SET GLOBAL wsrep_slave_threads = 1;
+SET GLOBAL wsrep_slave_threads = DEFAULT;
 SET GLOBAL debug_dbug = '';
 SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
 SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#22.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#22.test
index 544109dadee..302c11d8ff1 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#22.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#22.test
@@ -40,7 +40,6 @@ COMMIT;
 --connection node_1
 SELECT COUNT(*) = 6 FROM t1;
 
-
 --connection node_2
 SELECT COUNT(*) = 6 FROM t1;
 
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#96.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#96.test
index c773b310183..59875862f70 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#96.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#96.test
@@ -39,7 +39,3 @@ SELECT COUNT(*) = 0 FROM t2;
 --connection node_1
 DROP TABLE t1;
 DROP TABLE t2;
-
-
-
-
diff --git a/mysql-test/suite/wsrep/r/plugin.result b/mysql-test/suite/wsrep/r/plugin.result
index 4f52173cb25..2928acd07d2 100644
--- a/mysql-test/suite/wsrep/r/plugin.result
+++ b/mysql-test/suite/wsrep/r/plugin.result
@@ -1,3 +1,3 @@
-SELECT plugin_name,plugin_version,plugin_maturity   FROM information_schema.plugins    where plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name;
+SELECT plugin_name,plugin_version,plugin_maturity FROM information_schema.plugins WHERE plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name;
 plugin_name	plugin_version	plugin_maturity
 wsrep	1.0	Stable
diff --git a/mysql-test/suite/wsrep/suite.pm b/mysql-test/suite/wsrep/suite.pm
index 2ee33d83275..040a48c7964 100644
--- a/mysql-test/suite/wsrep/suite.pm
+++ b/mysql-test/suite/wsrep/suite.pm
@@ -9,9 +9,9 @@ return wsrep_not_ok() if wsrep_not_ok();
 
 push @::global_suppressions,
   (
-     qr(WSREP: Could not open saved state file for reading: .*),
-     qr(WSREP: Could not open state file for reading: .*),
-     qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
+     qr(WSREP: Could not open saved state file for reading: ),
+     qr(WSREP: Could not open state file for reading: ),
+     qr|WSREP: access file\(.*gvwstate.dat\) failed ?\(No such file or directory\)|,
    );
 
 bless { };
diff --git a/mysql-test/suite/wsrep/t/binlog_format.cnf b/mysql-test/suite/wsrep/t/binlog_format.cnf
index 7ec24c14d80..500a197e422 100644
--- a/mysql-test/suite/wsrep/t/binlog_format.cnf
+++ b/mysql-test/suite/wsrep/t/binlog_format.cnf
@@ -5,4 +5,3 @@ wsrep-on=ON
 wsrep-provider=@ENV.WSREP_PROVIDER
 wsrep-cluster-address=gcomm://
 innodb_autoinc_lock_mode=2
-
diff --git a/mysql-test/suite/wsrep/t/foreign_key.test b/mysql-test/suite/wsrep/t/foreign_key.test
index 71f6076a1d7..c14910c7f86 100644
--- a/mysql-test/suite/wsrep/t/foreign_key.test
+++ b/mysql-test/suite/wsrep/t/foreign_key.test
@@ -17,4 +17,3 @@ SELECT * FROM test.c;
 # Cleanup
 DROP TABLE c;
 DROP TABLE p;
-
diff --git a/mysql-test/suite/wsrep/t/mdev_10186.test b/mysql-test/suite/wsrep/t/mdev_10186.test
index 0f0aa287086..157e7b5a7b6 100644
--- a/mysql-test/suite/wsrep/t/mdev_10186.test
+++ b/mysql-test/suite/wsrep/t/mdev_10186.test
@@ -9,4 +9,3 @@
 
 SELECT @@wsrep_on;
 SET @@GLOBAL.wsrep_cluster_address='gcomm://';
-
diff --git a/mysql-test/suite/wsrep/t/mdev_7798.cnf b/mysql-test/suite/wsrep/t/mdev_7798.cnf
index 0bf01f81fc5..c2b7c4d415f 100644
--- a/mysql-test/suite/wsrep/t/mdev_7798.cnf
+++ b/mysql-test/suite/wsrep/t/mdev_7798.cnf
@@ -4,4 +4,3 @@
 wsrep-on=ON
 wsrep-provider=@ENV.WSREP_PROVIDER
 wsrep-cluster-address=gcomm://
-
diff --git a/mysql-test/suite/wsrep/t/plugin.test b/mysql-test/suite/wsrep/t/plugin.test
index 73d605b0918..90750403405 100644
--- a/mysql-test/suite/wsrep/t/plugin.test
+++ b/mysql-test/suite/wsrep/t/plugin.test
@@ -5,4 +5,4 @@
 # MDEV-7604: wsrep plugin lists its status as Unknown
 #
 
-SELECT plugin_name,plugin_version,plugin_maturity   FROM information_schema.plugins    where plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name;
\ No newline at end of file
+SELECT plugin_name,plugin_version,plugin_maturity FROM information_schema.plugins WHERE plugin_name like 'wsrep' ORDER BY plugin_maturity,plugin_name;
diff --git a/mysql-test/suite/wsrep/t/wsrep-recover.cnf b/mysql-test/suite/wsrep/t/wsrep-recover.cnf
index 19986cd97bc..489c4385dbd 100644
--- a/mysql-test/suite/wsrep/t/wsrep-recover.cnf
+++ b/mysql-test/suite/wsrep/t/wsrep-recover.cnf
@@ -6,4 +6,4 @@ binlog-format=ROW
 innodb-flush-log-at-trx-commit=1
 wsrep-cluster-address=gcomm://
 wsrep-provider=@ENV.WSREP_PROVIDER
-innodb-autoinc-lock-mode=2
\ No newline at end of file
+innodb-autoinc-lock-mode=2
diff --git a/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test b/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test
index 37e9c6c718e..718fc975071 100644
--- a/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test
+++ b/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test
@@ -2,7 +2,6 @@
 --source include/have_wsrep_provider.inc
 --source include/have_binlog_format_row.inc
 
-
 --echo #
 --echo # wsrep_forced_binlog_format
 --echo #
diff --git a/mysql-test/suite/wsrep/t/wsrep_rpl.test b/mysql-test/suite/wsrep/t/wsrep_rpl.test
index 4f34aadc365..98a70d0dfb1 100644
--- a/mysql-test/suite/wsrep/t/wsrep_rpl.test
+++ b/mysql-test/suite/wsrep/t/wsrep_rpl.test
@@ -41,4 +41,3 @@ eval SET @@GLOBAL.wsrep_max_ws_rows = $wsrep_max_ws_rows_slave;
 
 --source include/rpl_end.inc
 --echo # End of test.
-
diff --git a/mysql-test/suite/wsrep/t/wsrep_variables_sst_method.test b/mysql-test/suite/wsrep/t/wsrep_variables_sst_method.test
index b41718792a2..d63c3e5fafb 100644
--- a/mysql-test/suite/wsrep/t/wsrep_variables_sst_method.test
+++ b/mysql-test/suite/wsrep/t/wsrep_variables_sst_method.test
@@ -44,7 +44,6 @@ SET GLOBAL wsrep_sst_method='method;';
 SELECT @@global.wsrep_sst_method;
 SHOW WARNINGS;
 
-
 --disable_query_log
 SET @@global.wsrep_sst_method = @wsrep_sst_method_saved;
 --enable_query_log
diff --git a/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf b/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf
index 2e66b1ef23c..66a5dcc1f7c 100644
--- a/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf
+++ b/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf
@@ -9,4 +9,3 @@ wsrep-on=OFF
 #galera_port=@OPT.port
 #ist_port=@OPT.port
 #sst_port=@OPT.port
-
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 974ddfc1d4c..ebd2659ea6f 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -2089,14 +2089,15 @@ bool wsrep_should_replicate_ddl(THD* thd, const handlerton *hton)
 {
   if (!wsrep_strict_ddl)
     return true;
-  
-  if (!hton)
-    return true;
 
   DBUG_ASSERT(hton != nullptr);
 
   switch (hton->db_type)
   {
+    case DB_TYPE_UNKNOWN:
+      /* Special pseudo-handlertons (such as 10.6+ JSON tables). */
+      return true;
+      break;
     case DB_TYPE_INNODB:
       return true;
       break;
@@ -2123,7 +2124,7 @@ bool wsrep_should_replicate_ddl(THD* thd, const handlerton *hton)
   my_error(ER_GALERA_REPLICATION_NOT_SUPPORTED, MYF(0));
   push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
                       ER_ILLEGAL_HA,
-                      "WSREP: wsrep_strict_dll enabled. "
+                      "WSREP: wsrep_strict_ddl enabled. "
                       "Storage engine %s not supported.",
                       ha_resolve_storage_engine_name(hton));
   return false;