diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h
index 43c519d40bff3..9d8e7cc012ff5 100644
--- a/include/mysql/service_wsrep.h
+++ b/include/mysql/service_wsrep.h
@@ -7,7 +7,20 @@
 
 /* Copyright (c) 2015 MariaDB Corporation Ab
                  2018 Codership Oy <info@codership.com>
-*/
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
 /**
   @file
   wsrep service
diff --git a/mysql-test/include/have_wsrep_enabled.inc b/mysql-test/include/have_wsrep_enabled.inc
index 9287369c87c92..7eb8b4372cffa 100644
--- a/mysql-test/include/have_wsrep_enabled.inc
+++ b/mysql-test/include/have_wsrep_enabled.inc
@@ -1,7 +1,6 @@
 # To be used in a test which requires wsrep plugin to be ACTIVE and enabled
 # (i.e. wsrep_on=ON). It includes have_wsrep.inc.
 
---source include/have_wsrep.inc
 --source include/have_innodb.inc
 
 if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'wsrep_on' AND VARIABLE_VALUE='ON'`)
diff --git a/mysql-test/suite/galera/include/galera_dump_sr_table.inc b/mysql-test/suite/galera/include/galera_dump_sr_table.inc
index a15b1d8cb048b..48a55006eae31 100644
--- a/mysql-test/suite/galera/include/galera_dump_sr_table.inc
+++ b/mysql-test/suite/galera/include/galera_dump_sr_table.inc
@@ -2,8 +2,8 @@
 # Dump the contents of the SR table using mysqldump
 #
 
---let $sr_min = `SELECT MIN(seqno) FROM wsrep_schema.SR`
---let $sr_max = `SELECT MAX(seqno) FROM wsrep_schema.SR`
+--let $sr_min = `SELECT MIN(seqno) FROM mysql.wsrep_streaming_log`
+--let $sr_max = `SELECT MAX(seqno) FROM mysql.wsrep_streaming_log`
 
 --let $seqno = $sr_min
 while ($seqno <= $sr_max)
@@ -11,7 +11,7 @@ while ($seqno <= $sr_max)
   --let $sr_fragment_file = $MYSQLTEST_VARDIR/tmp/sr_fragment.log
   --exec rm -rf $sr_fragment_file
   --disable_query_log
-  --eval SELECT frag FROM wsrep_schema.SR WHERE seqno = $seqno INTO DUMPFILE '$sr_fragment_file'
+  --eval SELECT frag FROM mysql.wsrep_streaming_log WHERE seqno = $seqno INTO DUMPFILE '$sr_fragment_file'
   --enable_query_log
 
   --let $sr_binlog_file = $MYSQLTEST_VARDIR/tmp/sr_binlog.log
diff --git a/mysql-test/suite/galera/include/galera_st_clean_slave.inc b/mysql-test/suite/galera/include/galera_st_clean_slave.inc
index 5204477518694..3a49f4f6ad2e8 100644
--- a/mysql-test/suite/galera/include/galera_st_clean_slave.inc
+++ b/mysql-test/suite/galera/include/galera_st_clean_slave.inc
@@ -34,7 +34,6 @@ COMMIT;
 --remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/performance_schema
 --remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/test
 --remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/mysql
---remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data/wsrep_schema
 --remove_files_wildcard $MYSQLTEST_VARDIR/mysqld.2/data
 
 SET AUTOCOMMIT=OFF;
diff --git a/mysql-test/suite/galera/r/MW-416.result b/mysql-test/suite/galera/r/MW-416.result
index 3bcd89a0cd0d2..537e648df6baf 100644
--- a/mysql-test/suite/galera/r/MW-416.result
+++ b/mysql-test/suite/galera/r/MW-416.result
@@ -109,6 +109,5 @@ mtr
 mysql
 performance_schema
 test
-wsrep_schema
 wsrep_replicated_after_diff
 1
diff --git a/mysql-test/suite/galera/r/galera_bf_abort_group_commit.result b/mysql-test/suite/galera/r/galera_bf_abort_group_commit.result
index 52d44c3d5100d..2a2ddd519f454 100644
--- a/mysql-test/suite/galera/r/galera_bf_abort_group_commit.result
+++ b/mysql-test/suite/galera/r/galera_bf_abort_group_commit.result
@@ -42,10 +42,10 @@ f1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -94,10 +94,10 @@ f1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -146,10 +146,10 @@ f1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -198,10 +198,10 @@ f1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -258,10 +258,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -317,10 +317,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -376,10 +376,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -435,10 +435,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -495,10 +495,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -554,10 +554,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -613,10 +613,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -672,10 +672,10 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
diff --git a/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result b/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result
index 14e692b5642ca..7f145ac3d2815 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result
@@ -1,6 +1,6 @@
 connection node_2;
 connection node_1;
-SHOW CREATE TABLE wsrep_schema.cluster;
+SHOW CREATE TABLE mysql.wsrep_cluster;
 Table	Create Table
 cluster	CREATE TABLE `cluster` (
   `cluster_uuid` char(36) NOT NULL,
@@ -10,7 +10,7 @@ cluster	CREATE TABLE `cluster` (
   `capabilities` int(11) NOT NULL,
   PRIMARY KEY (`cluster_uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SHOW CREATE TABLE wsrep_schema.members;
+SHOW CREATE TABLE mysql.wsrep_members;
 Table	Create Table
 members	CREATE TABLE `members` (
   `node_uuid` char(36) NOT NULL,
@@ -19,54 +19,54 @@ members	CREATE TABLE `members` (
   `node_incoming_address` varchar(256) NOT NULL,
   PRIMARY KEY (`node_uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SELECT COUNT(*) = 1 FROM wsrep_schema.cluster;
+SELECT COUNT(*) = 1 FROM mysql.wsrep_cluster;
 COUNT(*) = 1
 1
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
 cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid')
 1
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 COUNT(*) = 3
 1
-SELECT COUNT(*) = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size') FROM wsrep_schema.members;
+SELECT COUNT(*) = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size') FROM mysql.wsrep_cluster_members;
 COUNT(*) = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size')
 1
-SELECT COUNT(*) = 1 FROM wsrep_schema.members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
+SELECT COUNT(*) = 1 FROM mysql.wsrep_cluster_members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
 COUNT(*) = 1
 1
-SELECT node_incoming_address LIKE '127.0.0.1:%' from wsrep_schema.members;
+SELECT node_incoming_address LIKE '127.0.0.1:%' from mysql.wsrep_cluster_members;
 node_incoming_address LIKE '127.0.0.1:%'
 1
 1
 1
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.members;
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster_members;
 cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid')
 1
 1
 1
-SELECT COUNT(*) = 1 FROM wsrep_schema.members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
+SELECT COUNT(*) = 1 FROM mysql.wsrep_cluster_members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
 COUNT(*) = 1
 1
 connection node_2;
 connection node_1;
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
 cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid')
 1
-SELECT COUNT(*) = 2 FROM wsrep_schema.members;
+SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_members;
 COUNT(*) = 2
 1
 connection node_2;
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
 cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid')
 1
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 COUNT(*) = 3
 1
 connection node_1;
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
 cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid')
 1
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 COUNT(*) = 3
 1
 connection node_1;
diff --git a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test
index 9c0b074ab0b84..5b7183ae0f3ad 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test
@@ -1,7 +1,7 @@
 #
 # This test performs basic checks on the contents of the wsrep_schema
 #
-# wsrep_schema.members_history checks are temporarily disabled until it
+# wsrep_members_history checks are temporarily disabled until it
 # can be made configurable.
 #
 
@@ -10,34 +10,34 @@
 
 # Make the test fail if table structure has changed
 
-SHOW CREATE TABLE wsrep_schema.cluster;
-SHOW CREATE TABLE wsrep_schema.members;
-#disabled SHOW CREATE TABLE wsrep_schema.members_history;
+SHOW CREATE TABLE mysql.wsrep_cluster;
+SHOW CREATE TABLE mysql.wsrep_cluster_members;
+#disabled SHOW CREATE TABLE mysql.wsrep_member_history;
 
-# Checks for the wsrep_schema.cluster table
+# Checks for the wsrep_cluster table
 
-SELECT COUNT(*) = 1 FROM wsrep_schema.cluster;
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
+SELECT COUNT(*) = 1 FROM mysql.wsrep_cluster;
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
 
-# Checks for the wsrep_schema.members table
+# Checks for the wsrep_cluster_members table
 
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
-SELECT COUNT(*) = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size') FROM wsrep_schema.members;
-SELECT COUNT(*) = 1 FROM wsrep_schema.members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
+SELECT COUNT(*) = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size') FROM mysql.wsrep_cluster_members;
+SELECT COUNT(*) = 1 FROM mysql.wsrep_cluster-members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
 
-SELECT node_incoming_address LIKE '127.0.0.1:%' from wsrep_schema.members;
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.members;
+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;
 
-# Checks for the wsrep_schema.members_history table
+# Checks for the wsrep_cluster_member_history table
 
-#disabled SELECT COUNT(*) = 3 FROM wsrep_schema.members_history;
-#disabled SELECT COUNT(*) = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size') FROM wsrep_schema.members_history;
-SELECT COUNT(*) = 1 FROM wsrep_schema.members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
+#disabled SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_member_history;
+#disabled SELECT COUNT(*) = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size') FROM mysql.wsrep_cluster_member_history;
+SELECT COUNT(*) = 1 FROM mysql.wsrep_members WHERE node_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_gcomm_uuid');
 
-#disabled SELECT last_view_id = (SELECT view_id FROM wsrep_schema.cluster) FROM wsrep_schema.members_history;
-#disabled SELECT last_view_seqno = (SELECT view_seqno FROM wsrep_schema.cluster) FROM wsrep_schema.members_history;
-#disabled SELECT node_incoming_address LIKE '127.0.0.1:%' from wsrep_schema.members_history;
-#disabled SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.members_history;
+#disabled SELECT last_view_id = (SELECT view_id FROM mysql.wsrep_cluster) FROM mysql.wsrep_cluster_member_history;
+#disabled SELECT last_view_seqno = (SELECT view_seqno FROM mysql.wsrep_cluster) FROM mysql.wsrep_cluster_member_history;
+#disabled SELECT node_incoming_address LIKE '127.0.0.1:%' from mysql.wsrep_cluster_member_history;
+#disabled SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster_member_history;
 
 --connection node_2
 --source include/shutdown_mysqld.inc
@@ -45,23 +45,23 @@ SELECT COUNT(*) = 1 FROM wsrep_schema.members WHERE node_uuid = (SELECT VARIABLE
 --connection node_1
 --source include/wait_until_connected_again.inc
 
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
-SELECT COUNT(*) = 2 FROM wsrep_schema.members;
-#disabled SELECT COUNT(*) = 3 FROM wsrep_schema.members_history;
-#disabled SELECT COUNT(*) = 2 FROM wsrep_schema.members_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM wsrep_schema.members_history);
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
+SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_members;
+#disabled SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_member_history;
+#disabled SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_member_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM mysql.wsrep_cluster_member_history);
 
 --connection node_2
 --source include/start_mysqld.inc
 --source include/wait_until_connected_again.inc
 
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
-#disabled SELECT COUNT(*) = 3 FROM wsrep_schema.members_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM wsrep_schema.members_history);
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
+#disabled SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_member_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM mysql.wsrep_cluster_member_history);
 
 --connection node_1
-SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM wsrep_schema.cluster;
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
-#disabled SELECT COUNT(*) = 3 FROM wsrep_schema.members_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM wsrep_schema.members_history);
+SELECT cluster_uuid = (SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_state_uuid') FROM mysql.wsrep_cluster;
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
+#disabled SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_member_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM mysql.wsrep_cluster_member_history);
 
 --connection node_1
 CALL mtr.add_suppression("SYNC message from member");
diff --git a/mysql-test/suite/galera_3nodes_ee/r/galera_nbo_slave_non_prim.result b/mysql-test/suite/galera_3nodes_ee/r/galera_nbo_slave_non_prim.result
index 4b704facf2425..42dfc2b699eb2 100644
--- a/mysql-test/suite/galera_3nodes_ee/r/galera_nbo_slave_non_prim.result
+++ b/mysql-test/suite/galera_3nodes_ee/r/galera_nbo_slave_non_prim.result
@@ -18,7 +18,7 @@ t1	CREATE TABLE `t1` (
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 COUNT(*) = 3
 1
 SHOW CREATE TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_ee/r/galera_vote_sr.result b/mysql-test/suite/galera_3nodes_ee/r/galera_vote_sr.result
index c2b618b86c40a..6be6e2c15815e 100644
--- a/mysql-test/suite/galera_3nodes_ee/r/galera_vote_sr.result
+++ b/mysql-test/suite/galera_3nodes_ee/r/galera_vote_sr.result
@@ -12,7 +12,7 @@ INSERT INTO t1 VALUES (3, REPEAT('A', 65535));
 INSERT INTO t1 VALUES (4, REPEAT('A', 65535));
 INSERT INTO t1 VALUES (5, REPEAT('A', 65535));
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 START TRANSACTION;
@@ -23,17 +23,17 @@ INSERT INTO t1 VALUES (14, REPEAT('A', 65535));
 INSERT INTO t1 VALUES (15, REPEAT('A', 65535));
 SET SESSION wsrep_on=OFF;
 Starting mysqld
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 10 FROM t1;
 COUNT(*) = 10
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 10 FROM t1;
@@ -43,7 +43,7 @@ CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table
 CALL mtr.add_suppression("Write_rows apply failed");
 CALL mtr.add_suppression("Inconsistent by consensus");
 CALL mtr.add_suppression("no THD for trx");
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 10 FROM t1;
diff --git a/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_failure.test b/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_failure.test
index 79ff032f02ba4..bdf7085274e5c 100644
--- a/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_failure.test
+++ b/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_failure.test
@@ -32,7 +32,7 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
 --connection node_1
 --source include/wait_until_connected_again.inc
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 2 FROM wsrep_schema.members;
+--let $wait_condition = SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_members;
 --source include/wait_condition.inc
 
 # Confirm that the DDL remains blocked in NBO
diff --git a/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_success.test b/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_success.test
index 995828b3ca14b..7ae44a712a718 100644
--- a/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_success.test
+++ b/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_master_non_prim_success.test
@@ -30,7 +30,7 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
 --connection node_1
 --source include/wait_until_connected_again.inc
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 2 FROM wsrep_schema.members;
+--let $wait_condition = SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_members;
 --source include/wait_condition.inc
 
 # Confirm that the DDL remains blocked in NBO
@@ -47,7 +47,7 @@ SET SESSION wsrep_sync_wait = 0;
 # Reconnect node #2 to cluster
 
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
---let $wait_condition = SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+--let $wait_condition = SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 --source include/wait_condition.inc
 --let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment'
 --source include/wait_condition.inc
@@ -56,7 +56,7 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
 
 --connection node_1
 --source include/wait_until_connected_again.inc
---let $wait_condition = SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+--let $wait_condition = SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 --source include/wait_condition.inc
 
 # DDL should now be complete
diff --git a/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_slave_non_prim.test b/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_slave_non_prim.test
index d4f3a4ffeddc5..bdd4602505424 100644
--- a/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_slave_non_prim.test
+++ b/mysql-test/suite/galera_3nodes_ee/t/galera_nbo_slave_non_prim.test
@@ -29,7 +29,7 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
 --connection node_1a
 --source include/wait_until_connected_again.inc
 SET SESSION wsrep_sync_wait = 0;
---let $wait_condition = SELECT COUNT(*) = 2 FROM wsrep_schema.members;
+--let $wait_condition = SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_members;
 --source include/wait_condition.inc
 
 --connection node_1
@@ -44,7 +44,7 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
 --connection node_1
 --source include/wait_until_connected_again.inc
 --source include/galera_wait_ready.inc
---let $wait_condition = SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+--let $wait_condition = SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 --source include/wait_condition.inc
 
 SHOW CREATE TABLE t1;
@@ -53,7 +53,7 @@ SELECT COUNT(*) = 1 FROM t1;
 --connection node_2
 --source include/wait_until_connected_again.inc
 --source include/galera_wait_ready.inc
-SELECT COUNT(*) = 3 FROM wsrep_schema.members;
+SELECT COUNT(*) = 3 FROM mysql.wsrep_cluster_members;
 SHOW CREATE TABLE t1;
 SELECT COUNT(*) = 1 FROM t1;
 
diff --git a/mysql-test/suite/galera_3nodes_ee/t/galera_vote_sr.test b/mysql-test/suite/galera_3nodes_ee/t/galera_vote_sr.test
index 7655c818de6e9..cacb79fb3fa56 100644
--- a/mysql-test/suite/galera_3nodes_ee/t/galera_vote_sr.test
+++ b/mysql-test/suite/galera_3nodes_ee/t/galera_vote_sr.test
@@ -26,9 +26,9 @@ INSERT INTO t1 VALUES (3, REPEAT('A', 65535));
 INSERT INTO t1 VALUES (4, REPEAT('A', 65535));
 INSERT INTO t1 VALUES (5, REPEAT('A', 65535));
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
-# Perform another SR transaction in order to have stuff in the wsrep_schema.SR table
+# Perform another SR transaction in order to have stuff in the mysql.wsrep_streaming_log table
 START TRANSACTION;
 INSERT INTO t1 VALUES (11, REPEAT('A', 65535));
 INSERT INTO t1 VALUES (12, REPEAT('A', 65535));
@@ -59,7 +59,7 @@ SET SESSION wsrep_on=OFF;
 --source include/wait_condition.inc
 
 # Node #2 should have some entries in its SR table post-restart
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 # Commit second SR transaction
 --connection node_1
@@ -67,11 +67,11 @@ COMMIT;
 
 # Confirm that all nodes are identical
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 10 FROM t1;
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 10 FROM t1;
 CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table test.t1; Duplicate entry '5' for key 'PRIMARY'");
 CALL mtr.add_suppression("Write_rows apply failed");
@@ -80,7 +80,7 @@ CALL mtr.add_suppression("no THD for trx");
 
 --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
 --connection node_3
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 10 FROM t1;
 
 --connection node_1
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-336.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-336.result
index ac3813176c9bf..bb6c11edf36d7 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-336.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-336.result
@@ -3,10 +3,10 @@ SET SESSION wsrep_trx_fragment_size = 1;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-582.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-582.result
index 68a8fde0abc3e..9e2a4823973d8 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-582.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-582.result
@@ -7,10 +7,10 @@ INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COUNT(*)
 5
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COUNT(*)
 5
 COMMIT;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-606.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-606.result
index b32b50fc4d3ea..775f7ee0412c4 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-606.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-606.result
@@ -21,7 +21,7 @@ connection node_2a;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
 connection node_1;
 connection node_1;
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 0
 connection node_2;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-609.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-609.result
index 52544166e29dd..8fe13c7e2bffb 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-609.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-609.result
@@ -10,10 +10,10 @@ INSERT INTO t1 VALUES (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
 INSERT INTO t1 VALUES (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 INSERT INTO t1 VALUES (31),(32),(33);
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 0
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 0
 COMMIT;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-810A.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-810A.result
index 9064030aa89dd..9a83ff3c04166 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-810A.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-810A.result
@@ -17,13 +17,13 @@ Got one of the listed errors
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 COMMIT;
@@ -39,13 +39,13 @@ COUNT(*) = 0
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug = '';
@@ -68,13 +68,13 @@ Got one of the listed errors
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 COMMIT;
@@ -90,13 +90,13 @@ COUNT(*) = 0
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug = '';
@@ -119,13 +119,13 @@ Got one of the listed errors
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 COMMIT;
@@ -141,13 +141,13 @@ COUNT(*) = 0
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug = '';
@@ -170,13 +170,13 @@ Got one of the listed errors
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 COMMIT;
@@ -192,13 +192,13 @@ COUNT(*) = 0
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug = '';
@@ -221,13 +221,13 @@ Got one of the listed errors
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 COMMIT;
@@ -243,13 +243,13 @@ COUNT(*) = 0
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug = '';
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-810B.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-810B.result
index a0f002ac627b2..bbec3531a49d0 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-810B.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-810B.result
@@ -15,13 +15,13 @@ COMMIT;
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 COMMIT;
@@ -37,13 +37,13 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug = '';
@@ -64,13 +64,13 @@ COMMIT;
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 COMMIT;
@@ -86,13 +86,13 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug = '';
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-810C.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-810C.result
index cddd8918a2ace..1a6dcbfd392ea 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-810C.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-810C.result
@@ -9,7 +9,7 @@ SET SESSION wsrep_trx_fragment_size=1;
 INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary');
 SELECT 1 FROM t1;
 Got one of the listed errors
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -17,10 +17,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -28,10 +28,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -39,7 +39,7 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug="d,crash_commit_cb_before_last_fragment_commit";
@@ -53,7 +53,7 @@ SET SESSION wsrep_trx_fragment_size=1;
 INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary');
 SELECT 1 FROM t1;
 Got one of the listed errors
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -61,10 +61,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -72,10 +72,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -83,7 +83,7 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug="d,crash_apply_cb_after_fragment_removal";
@@ -97,7 +97,7 @@ SET SESSION wsrep_trx_fragment_size=1;
 INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary');
 SELECT 1 FROM t1;
 Got one of the listed errors
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -105,10 +105,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -116,10 +116,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -127,7 +127,7 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET GLOBAL debug="d,crash_apply_cb_before_fragment_removal";
@@ -141,7 +141,7 @@ SET SESSION wsrep_trx_fragment_size=1;
 INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary'),('primary');
 SELECT 1 FROM t1;
 Got one of the listed errors
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -149,10 +149,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -160,10 +160,10 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 SELECT COUNT(*) > 0 FROM t1 WHERE f1 = 'primary';
 COUNT(*) > 0
@@ -171,7 +171,7 @@ COUNT(*) > 0
 SELECT COUNT(*) = 0 FROM t1 WHERE f1 = 'secondary';
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-817.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-817.result
index e36533925bd09..4eb0ebca4f4a8 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-817.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-817.result
@@ -18,14 +18,14 @@ INSERT INTO t1 VALUES (6);
 INSERT INTO t1 VALUES (7);
 connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 SET SESSION wsrep_sync_wait = 0;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_2;
 connection node_1a;
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
 SET SESSION wsrep_on = OFF;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_2;
@@ -36,18 +36,18 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
 connection node_3;
 connection node_1a;
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
 COMMIT;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 connection node_1a;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result
index 187ca1bb27864..d670b8c24a006 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result
@@ -16,11 +16,11 @@ INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_isolate_master.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_isolate_master.result
index 037479c7b9e5a..bb4eb829abce4 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_isolate_master.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_isolate_master.result
@@ -10,7 +10,7 @@ INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_2;
@@ -25,7 +25,7 @@ connection node_2;
 connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 connection node_2;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 0 FROM t1;
@@ -33,7 +33,7 @@ COUNT(*) = 0
 1
 connection node_3;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 0 FROM t1;
@@ -51,7 +51,7 @@ SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 START TRANSACTION;
@@ -65,14 +65,14 @@ connection node_2;
 SELECT COUNT(*) = 5 FROM t1;
 COUNT(*) = 5
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_3;
 SELECT COUNT(*) = 5 FROM t1;
 COUNT(*) = 5
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result
index c28b97d773299..1a17956566679 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result
@@ -19,12 +19,12 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 connection node_2;
 Killing server ...
 connection node_3;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 INSERT INTO t1 VALUES (1);
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 1 FROM t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result
index a8a3be9533ca3..595bd30d67504 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result
@@ -32,12 +32,12 @@ INSERT INTO t1 VALUES (14);
 INSERT INTO t1 VALUES (15);
 connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) = 15 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 15 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 15
 1
 connection node_1;
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
@@ -45,7 +45,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT COUNT(*) = 15 FROM t1;
 COUNT(*) = 15
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result
index 1cc6225f1bb2f..239eb748385ab 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result
@@ -32,12 +32,12 @@ INSERT INTO t1 VALUES (14);
 INSERT INTO t1 VALUES (15);
 connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) = 15 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 15 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 15
 1
 connection node_1;
 ROLLBACK;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
@@ -45,14 +45,14 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback2.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback2.result
index 8b015c269774a..21e301ed35398 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback2.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback2.result
@@ -11,21 +11,21 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 Killing server ...
 INSERT INTO t1 VALUES (6);
 ROLLBACK;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
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 0c24c7ebf540f..4a135cd9274fa 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
@@ -36,7 +36,7 @@ COUNT(*) = 5
 1
 connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_threeway_split.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_threeway_split.result
index 65f443dec9917..1a50bace279b6 100644
--- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_threeway_split.result
+++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_threeway_split.result
@@ -14,7 +14,7 @@ INSERT INTO t1 VALUES (11);
 INSERT INTO t1 VALUES (12);
 INSERT INTO t1 VALUES (13);
 INSERT INTO t1 VALUES (14);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_2;
@@ -63,7 +63,7 @@ connection node_3a;
 connection node_2;
 COMMIT;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 wsrep_gcomm_uuid_match
@@ -71,7 +71,7 @@ wsrep_gcomm_uuid_match
 connection node_3;
 COMMIT;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 COUNT(DISTINCT node_uuid) = 1
 1
 wsrep_gcomm_uuid_match
@@ -86,7 +86,7 @@ COMMIT;
 SELECT COUNT(*) = 15, MIN(f1) = 10, MAX(f1) = 34 FROM t1;
 COUNT(*) = 15	MIN(f1) = 10	MAX(f1) = 34
 1	1	1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -95,7 +95,7 @@ COMMIT;
 SELECT COUNT(*) = 15, MIN(f1) = 10, MAX(f1) = 34 FROM t1;
 COUNT(*) = 15	MIN(f1) = 10	MAX(f1) = 34
 1	1	1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
@@ -104,7 +104,7 @@ COMMIT;
 SELECT COUNT(*) = 15, MIN(f1) = 10, MAX(f1) = 34 FROM t1;
 COUNT(*) = 15	MIN(f1) = 10	MAX(f1) = 34
 1	1	1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=ON;
diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test
index ea8bed454ca5c..b8d46db74f19c 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-336.test
@@ -11,10 +11,10 @@ INSERT INTO t1 VALUES (1);
 
 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
 --connection node_2a
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) > 0 FROM t1;
 
diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-582.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-582.test
index ab029594f4dfa..bf19ea84c871b 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-582.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-582.test
@@ -26,10 +26,10 @@ INSERT INTO t1 VALUES (5);
 --source include/wait_until_connected_again.inc
 --source include/galera_wait_ready.inc
 
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 
 --connection node_1
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COMMIT;
 SELECT COUNT(*) FROM t1;
 
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 b02a7a530c865..6d49247ab5e39 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-606.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-606.test
@@ -23,7 +23,7 @@ INSERT INTO t1 VALUES (23);
 INSERT INTO t1 VALUES (24);
 
 --connection node_1
---let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR
+--let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 #
@@ -47,7 +47,7 @@ SET WSREP_ON=ON;
 # Confirm that node_1 has no transactions in SR table
 #
 
---let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 #
@@ -63,7 +63,7 @@ SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
 --source include/wait_condition.inc
 
 --connection node_1
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 --error ER_LOCK_DEADLOCK
diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-609.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-609.test
index 6e5da4bf34923..fd346cf365bc5 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-609.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-609.test
@@ -21,10 +21,10 @@ INSERT INTO t1 VALUES (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
 INSERT INTO t1 VALUES (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
 INSERT INTO t1 VALUES (31),(32),(33);
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COMMIT;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-817.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-817.test
index c4eee6a6da1e3..a32da9594295b 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-817.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-817.test
@@ -27,10 +27,10 @@ INSERT INTO t1 VALUES (7);
 
 --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
 SET SESSION wsrep_sync_wait = 0;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 --connection node_1a
@@ -42,14 +42,14 @@ SET SESSION wsrep_on = OFF;
 --source include/wait_condition.inc
 
 # SR table on master should still contain entries after going non-Prim
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
 --source include/wait_condition.inc
 
 # SR table on slave should eventually clean up entries when master goes non-Prim
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 --connection node_3
@@ -85,12 +85,12 @@ SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
 --source include/galera_wait_ready.inc
 
 # SR table on master should contain no entries after going back to Prim state
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 --connection node_2
 # And none on slave
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 --error ER_LOCK_DEADLOCK
@@ -98,10 +98,10 @@ COMMIT;
 
 # SR table is now empty everywhere
 --connection node_1a
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test b/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test
index d810e36e8cd33..c5a6346d6a143 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/GCF-832.test
@@ -1,5 +1,5 @@
 #
-# GCF-832 SR: wsrep_schema.SR table remains populated on all nodes after crash
+# GCF-832 SR: mysql.wsrep_streaming_log table remains populated on all nodes after crash
 # followed by immediate recovery
 #
 --source include/galera_cluster.inc
@@ -32,11 +32,11 @@ COMMIT;
 --source include/start_mysqld.inc
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 --enable_reconnect
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_isolate_master.test b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_isolate_master.test
index a55109e57e493..30fd0192f261b 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_isolate_master.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_isolate_master.test
@@ -18,10 +18,10 @@ INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
@@ -47,21 +47,21 @@ SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 --source include/galera_wait_ready.inc
 
 #
-# Expect that the transaction is cleaned up entirely across the cluster and in all wsrep_schema.SR tables
+# Expect that the transaction is cleaned up entirely across the cluster and in all mysql.wsrep_streaming_log tables
 #
 
 --connection node_2
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 
 --connection node_3
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 
 #
@@ -93,10 +93,10 @@ COMMIT;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 #
 # Confirm that the transaction can be retried
@@ -111,16 +111,16 @@ INSERT INTO t1 VALUES (5);
 COMMIT;
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 SELECT COUNT(*) = 5 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_3
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 SELECT COUNT(*) = 5 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 CALL mtr.add_suppression("failed to send SR rollback for");
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_master.test b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_master.test
index 37dde9cd74f3e..c7e7528679b4d 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_master.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_master.test
@@ -39,10 +39,10 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) = 0 FROM t1;
 --source include/wait_condition.inc
 
---let $wait_condition = SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # and we can insert them again
 INSERT INTO t1 VALUES (1);
@@ -50,7 +50,7 @@ INSERT INTO t1 VALUES (1);
 --connection node_2
 --source include/start_mysqld.inc
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 1 FROM t1;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply.test b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply.test
index 1de36fe1fa225..270af538085ee 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply.test
@@ -61,17 +61,17 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) = 15 FROM t1;
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 15 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 15 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 COMMIT;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT COUNT(*) = 15 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback.test b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback.test
index 1dbdfbf80b11d..c0df6b2777a4d 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_kill_slave_after_apply_rollback.test
@@ -59,21 +59,21 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) = 15 FROM t1;
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 15 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 15 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 ROLLBACK;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
 
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 603483a419c7c..83964769ef5ff 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
@@ -33,7 +33,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 INSERT INTO t1 VALUES (6);
 ROLLBACK;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 --source include/start_mysqld.inc
@@ -47,10 +47,10 @@ SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
 --connection node_2
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
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 b0e61b28d607e..92566fa632369 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
@@ -52,7 +52,7 @@ INSERT INTO t1 VALUES (5);
 --source include/start_mysqld.inc
 
 # Expect that the SR table will get some entries after the restart
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 --connection node_1
@@ -64,7 +64,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 --let $wait_condition = SELECT COUNT(*) = 5 FROM t1;
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.test b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.test
index c9f4283848ccd..62122fe429270 100644
--- a/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.test
+++ b/mysql-test/suite/galera_3nodes_sr/t/galera_sr_threeway_split.test
@@ -31,10 +31,10 @@ INSERT INTO t1 VALUES (12);
 INSERT INTO t1 VALUES (13);
 INSERT INTO t1 VALUES (14);
 
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 SET SESSION wsrep_trx_fragment_size = 1;
@@ -47,7 +47,7 @@ INSERT INTO t1 VALUES (203);
 INSERT INTO t1 VALUES (204);
 
 --connection node_3
---let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 2 FROM wsrep_schema.SR
+--let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 2 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 SET SESSION wsrep_trx_fragment_size = 1;
@@ -64,7 +64,7 @@ INSERT INTO t1 VALUES (304);
 --connect node_3a, 127.0.0.1, root, , test, $NODE_MYPORT_3
 
 --connection node_1a
---let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 3 FROM wsrep_schema.SR
+--let $wait_condition = SELECT COUNT(DISTINCT node_uuid) = 3 FROM mysql.wsrep_streaming_log
 --source include/wait_condition.inc
 
 #
@@ -120,17 +120,17 @@ SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
 --connection node_2
 --error ER_LOCK_DEADLOCK
 COMMIT;
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 --disable_query_log
---eval SELECT DISTINCT node_uuid = '$node_1_gcomm_uuid' AS wsrep_gcomm_uuid_match FROM wsrep_schema.SR;
+--eval SELECT DISTINCT node_uuid = '$node_1_gcomm_uuid' AS wsrep_gcomm_uuid_match FROM mysql.wsrep_streaming_log;
 --enable_query_log
 
 --connection node_3
 --error ER_LOCK_DEADLOCK
 COMMIT;
-SELECT COUNT(DISTINCT node_uuid) = 1 FROM wsrep_schema.SR;
+SELECT COUNT(DISTINCT node_uuid) = 1 FROM mysql.wsrep_streaming_log;
 --disable_query_log
---eval SELECT DISTINCT node_uuid = '$node_1_gcomm_uuid' AS wsrep_gcomm_uuid_match FROM wsrep_schema.SR;
+--eval SELECT DISTINCT node_uuid = '$node_1_gcomm_uuid' AS wsrep_gcomm_uuid_match FROM mysql.wsrep_streaming_log;
 --enable_query_log
 
 #
@@ -150,19 +150,19 @@ COMMIT;
 #
 
 SELECT COUNT(*) = 15, MIN(f1) = 10, MAX(f1) = 34 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SET AUTOCOMMIT=ON;
 
 --connection node_2
 COMMIT;
 SELECT COUNT(*) = 15, MIN(f1) = 10, MAX(f1) = 34 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SET AUTOCOMMIT=ON;
 
 --connection node_3
 COMMIT;
 SELECT COUNT(*) = 15, MIN(f1) = 10, MAX(f1) = 34 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SET AUTOCOMMIT=ON;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/GCF-1051.result b/mysql-test/suite/galera_sr/r/GCF-1051.result
index 56e1f575047f3..82fa389bb1d9f 100644
--- a/mysql-test/suite/galera_sr/r/GCF-1051.result
+++ b/mysql-test/suite/galera_sr/r/GCF-1051.result
@@ -13,14 +13,14 @@ connection node_1;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -33,14 +33,14 @@ connection node_1;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/GCF-437.result b/mysql-test/suite/galera_sr/r/GCF-437.result
index 5d04022655f70..1aa0c9c0768f5 100644
--- a/mysql-test/suite/galera_sr/r/GCF-437.result
+++ b/mysql-test/suite/galera_sr/r/GCF-437.result
@@ -5,7 +5,7 @@ SET SESSION wsrep_trx_fragment_size = 2 * 1024 * 1024;
 INSERT INTO t1 (f2) SELECT REPEAT('x', 512) FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
 ERROR HY000: Writing one row to the row-based binary log failed
 CALL mtr.add_suppression("InnoDB: The total blob data length*");
-CALL mtr.add_suppression("WSREP: Error writing into wsrep_schema.SR: 139");
+CALL mtr.add_suppression("WSREP: Error writing into mysql.wsrep_streaming_log: 139");
 CALL mtr.add_suppression("WSREP: Failed to write to frag table: 1");
 CALL mtr.add_suppression("WSREP: Failed to append frag to persistent storage");
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/GCF-561.result b/mysql-test/suite/galera_sr/r/GCF-561.result
index 61f1ad8838e85..58663caf13447 100644
--- a/mysql-test/suite/galera_sr/r/GCF-561.result
+++ b/mysql-test/suite/galera_sr/r/GCF-561.result
@@ -12,20 +12,20 @@ INSERT INTO t1 VALUES (4, 4);
 INSERT INTO t1 VALUES (5, 5);
 connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 ALTER TABLE t1 DROP COLUMN f2;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
 INSERT INTO t1 VALUES (6, 6);
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 INSERT INTO t1 VALUES (6, 6);
@@ -44,7 +44,7 @@ connection node_2;
 SELECT COUNT(*) = 5 FROM t1;
 COUNT(*) = 5
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/GCF-571.result b/mysql-test/suite/galera_sr/r/GCF-571.result
index 7bf522aae366b..4b4f749d91038 100644
--- a/mysql-test/suite/galera_sr/r/GCF-571.result
+++ b/mysql-test/suite/galera_sr/r/GCF-571.result
@@ -16,51 +16,51 @@ INSERT INTO t1 VALUES ('xyzxyz');
 INSERT INTO t1 VALUES ('xyzxyz');
 connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 connection node_1a;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%abcdef%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%abcdef%';
 COUNT(*) > 0
 1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%xyz%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%xyz%';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%SAVEPOINT `A`%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%SAVEPOINT `A`%';
 COUNT(*) = 1
 0
 connection node_1;
 ROLLBACK TO SAVEPOINT A;
 connection node_1a;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%abcdef%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%abcdef%';
 COUNT(*) > 0
 1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%xyz%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%xyz%';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%SAVEPOINT `A`%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%SAVEPOINT `A`%';
 COUNT(*) = 1
 0
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%ROLLBACK TO `A`%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%ROLLBACK TO `A`%';
 COUNT(*) = 1
 0
 connection node_2;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%abcdef%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%abcdef%';
 COUNT(*) > 0
 1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%xyz%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%xyz%';
 COUNT(*) > 0
 1
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%SAVEPOINT `A`%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%SAVEPOINT `A`%';
 COUNT(*) = 1
 0
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%ROLLBACK TO `A`%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%ROLLBACK TO `A`%';
 COUNT(*) = 1
 0
 connection node_1;
 ROLLBACK;
 connection node_1a;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
diff --git a/mysql-test/suite/galera_sr/r/GCF-572.result b/mysql-test/suite/galera_sr/r/GCF-572.result
index 9a2ff2b294ffc..cb4d48b360008 100644
--- a/mysql-test/suite/galera_sr/r/GCF-572.result
+++ b/mysql-test/suite/galera_sr/r/GCF-572.result
@@ -17,7 +17,7 @@ f1	f2
 SET SESSION wsrep_trx_fragment_size = 10000;
 START TRANSACTION;
 INSERT INTO t1 VALUE (10, 'node1');
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
 connection node_1a;
 INSERT INTO t1 VALUES(15, 'node2');
diff --git a/mysql-test/suite/galera_sr/r/GCF-623.result b/mysql-test/suite/galera_sr/r/GCF-623.result
index ee834de52948a..f3500b7ac2b1a 100644
--- a/mysql-test/suite/galera_sr/r/GCF-623.result
+++ b/mysql-test/suite/galera_sr/r/GCF-623.result
@@ -19,11 +19,11 @@ COUNT(*) = 0
 connection node_1;
 COMMIT;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/GCF-627.result b/mysql-test/suite/galera_sr/r/GCF-627.result
index b91a87533941c..891cf4af5a9fa 100644
--- a/mysql-test/suite/galera_sr/r/GCF-627.result
+++ b/mysql-test/suite/galera_sr/r/GCF-627.result
@@ -16,11 +16,11 @@ connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 INSERT INTO t1 VALUES (2);
 ERROR 42S02: Table 'test.t1' doesn't exist
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera_sr/r/GCF-845.result b/mysql-test/suite/galera_sr/r/GCF-845.result
index 10b24c56d4734..df8420493329f 100644
--- a/mysql-test/suite/galera_sr/r/GCF-845.result
+++ b/mysql-test/suite/galera_sr/r/GCF-845.result
@@ -10,11 +10,11 @@ COMMIT;
 DELETE FROM t1 WHERE f1 > 13;
 disconnect node_1a;
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/GCF-851.result b/mysql-test/suite/galera_sr/r/GCF-851.result
index 90d95e8da8fb8..52aa4c7874513 100644
--- a/mysql-test/suite/galera_sr/r/GCF-851.result
+++ b/mysql-test/suite/galera_sr/r/GCF-851.result
@@ -4,20 +4,20 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 SET SESSION WSREP_TRX_FRAGMENT_SIZE=1;
 SET SESSION AUTOCOMMIT=OFF;
 INSERT INTO t1 VALUES (10);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_2;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_1;
 START TRANSACTION;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) > 0 FROM t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_bf_abort.result b/mysql-test/suite/galera_sr/r/galera_sr_bf_abort.result
index dab317c54b30f..bf92a48b24265 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_bf_abort.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_bf_abort.result
@@ -56,11 +56,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -121,11 +121,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -186,11 +186,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -251,11 +251,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -324,11 +324,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -396,11 +396,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -468,11 +468,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
@@ -540,11 +540,11 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
 COUNT(*) = 1
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
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 ae856a0f0f5ad..79bc29200f9ac 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
@@ -12,11 +12,11 @@ INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_1;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
@@ -28,16 +28,16 @@ connection node_2;
 INSERT INTO t1 VALUES (6);
 ERROR HY000: Lost connection to MySQL server during query
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2a;
 connection node_1;
 connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2;
 connection node_2b;
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 node_uuid	trx_id	seqno	flags	frag
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=OFF;
@@ -48,14 +48,14 @@ INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
 SELECT COUNT(*) = 5 FROM t1;
 COUNT(*) = 5
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_cc_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_cc_slave.result
index a2c61693c6113..6eb1ff67108ab 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_cc_slave.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_cc_slave.result
@@ -1,7 +1,7 @@
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
@@ -13,10 +13,10 @@ INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 SET GLOBAL wsrep_cluster_address = '';
@@ -25,10 +25,10 @@ INSERT INTO t1 VALUES (7);
 INSERT INTO t1 VALUES (8);
 INSERT INTO t1 VALUES (9);
 INSERT INTO t1 VALUES (10);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 INSERT INTO t1 VALUES (11);
@@ -37,10 +37,10 @@ INSERT INTO t1 VALUES (13);
 INSERT INTO t1 VALUES (14);
 INSERT INTO t1 VALUES (16);
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_ddl_master.result b/mysql-test/suite/galera_sr/r/galera_sr_ddl_master.result
index c724aa85282ec..cf9c7771bed0b 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_ddl_master.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_ddl_master.result
@@ -12,7 +12,7 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 connection node_2;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
@@ -20,7 +20,7 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
 connection node_1;
 INSERT INTO t1 VALUES (6);
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 ROLLBACK;
@@ -35,14 +35,14 @@ COMMIT;
 SELECT COUNT(*) = 6 FROM t1;
 COUNT(*) = 6
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 6 FROM t1;
 COUNT(*) = 6
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_ddl_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_ddl_slave.result
index 61f1ad8838e85..58663caf13447 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_ddl_slave.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_ddl_slave.result
@@ -12,20 +12,20 @@ INSERT INTO t1 VALUES (4, 4);
 INSERT INTO t1 VALUES (5, 5);
 connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 ALTER TABLE t1 DROP COLUMN f2;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
 INSERT INTO t1 VALUES (6, 6);
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 INSERT INTO t1 VALUES (6, 6);
@@ -44,7 +44,7 @@ connection node_2;
 SELECT COUNT(*) = 5 FROM t1;
 COUNT(*) = 5
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_ddl_unrelated.result b/mysql-test/suite/galera_sr/r/galera_sr_ddl_unrelated.result
index 0c74872ff32f7..0f23ade58c14c 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_ddl_unrelated.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_ddl_unrelated.result
@@ -13,14 +13,14 @@ INSERT INTO t1 VALUES (4, 4);
 INSERT INTO t1 VALUES (5, 5);
 connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 ALTER TABLE t2 DROP COLUMN f2;
 SELECT COUNT(*) = 5 FROM t1;
 COUNT(*) = 5
 1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 connection node_1;
@@ -28,14 +28,14 @@ INSERT INTO t1 VALUES (6, 6);
 connection node_2;
 connection node_1;
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 6 FROM t1;
 COUNT(*) = 6
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_dupkey_error.result b/mysql-test/suite/galera_sr/r/galera_sr_dupkey_error.result
index e5b88a5481921..b23b934da3373 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_dupkey_error.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_dupkey_error.result
@@ -16,11 +16,11 @@ connection node_1;
 INSERT INTO t1 VALUES (REPEAT('c', 512));
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result
index 00bcf891a39cf..a78926a979428 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result
@@ -16,14 +16,14 @@ Killing server ...
 connection node_1;
 connection node_2;
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result
index b2a0d337532bd..7525cd6d4b7bf 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result
@@ -16,7 +16,7 @@ Killing server ...
 connection node_1;
 connection node_2;
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
@@ -24,7 +24,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result
index b2a0d337532bd..7525cd6d4b7bf 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result
@@ -16,7 +16,7 @@ Killing server ...
 connection node_1;
 connection node_2;
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
@@ -24,7 +24,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_query.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_query.result
index 016ff938502de..59942e717e7bf 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_kill_query.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_query.result
@@ -16,7 +16,7 @@ connection node_2;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 INSERT INTO t1 SELECT 1 FROM ten AS t1, ten AS t2, ten AS t3;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result
index e3a85619fabe8..b4e84b1b72a21 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result
@@ -38,14 +38,14 @@ INSERT INTO t1 VALUES (13);
 INSERT INTO t1 VALUES (14);
 INSERT INTO t1 VALUES (15);
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 15 FROM t1;
 COUNT(*) = 15
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_large_fragment.result b/mysql-test/suite/galera_sr/r/galera_sr_large_fragment.result
index dcf6347631a6d..bf111f5cee49c 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_large_fragment.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_large_fragment.result
@@ -8,7 +8,7 @@ SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 (f2) SELECT REPEAT('x', 512) FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
 connection node_2;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
@@ -21,7 +21,7 @@ connection node_2;
 SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT10M';
 SET SESSION wsrep_sync_wait = 7;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 0 FROM t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_many_fragments.result b/mysql-test/suite/galera_sr/r/galera_sr_many_fragments.result
index d04ecbc3654bd..8c89d10026021 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_many_fragments.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_many_fragments.result
@@ -8,7 +8,7 @@ SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 (f2) SELECT REPEAT('x', 512) FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4;
 connection node_2;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
@@ -21,7 +21,7 @@ connection node_2;
 SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT10M';
 SET SESSION wsrep_sync_wait = 7;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 0 FROM t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
index bdbe0d2180e31..f1b60c7f76acf 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
@@ -26,7 +26,7 @@ connection node_2;
 Starting server ...
 connection node_1;
 connection node_2;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result
index 09c3e37b97341..eb493f66ed645 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result
@@ -11,14 +11,14 @@ INSERT INTO t1 VALUES (1),(2),(3);
 connection node_1;
 connection node_2;
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 INSERT INTO t1 VALUES (1),(2),(3);
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
index 6d2000b1cfeb6..568452b10b0cc 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
@@ -20,7 +20,7 @@ connection node_1a;
 INSERT INTO t1 VALUES (14),(15),(16);
 COMMIT;
 connection node_2;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) > 0
 1
 SELECT COUNT(*) = 6 FROM t1 WHERE f1 IN (11,12,13,14,15,16);
@@ -30,14 +30,14 @@ connection node_1b;
 INSERT INTO t1 VALUES (24),(25),(26);
 COMMIT;
 connection node_2;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SELECT COUNT(*) = 12 FROM t1;
 COUNT(*) = 12
 1
 connection node_1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_transaction_replay.result b/mysql-test/suite/galera_sr/r/galera_sr_transaction_replay.result
index c03eed88fedb2..5806ab5558d9b 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_transaction_replay.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_transaction_replay.result
@@ -44,7 +44,7 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 wsrep_local_replays
@@ -56,7 +56,7 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DELETE FROM t1;
@@ -102,7 +102,7 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 wsrep_local_replays
@@ -114,7 +114,7 @@ COUNT(*) = 1
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DELETE FROM t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result b/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result
index a46b6615bdc82..4e3bd52483e15 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result
@@ -13,7 +13,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COUNT(*)
 0
 connection node_1;
@@ -22,7 +22,7 @@ connection node_2;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 2
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COUNT(*)
 1
 connection node_1;
@@ -33,7 +33,7 @@ connection node_2;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 5
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COUNT(*)
 2
 connection node_1;
@@ -41,14 +41,14 @@ COMMIT;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 5
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COUNT(*)
 0
 connection node_2;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 5
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 COUNT(*)
 0
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep#215.result b/mysql-test/suite/galera_sr/r/mysql-wsrep#215.result
index 28baaadb5fe77..623bef4c3c471 100644
--- a/mysql-test/suite/galera_sr/r/mysql-wsrep#215.result
+++ b/mysql-test/suite/galera_sr/r/mysql-wsrep#215.result
@@ -5,7 +5,7 @@ connection node_1;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
 SET SESSION wsrep_trx_fragment_size = 2;
 SET SESSION wsrep_trx_fragment_unit = 'statements';
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=OFF;
@@ -35,14 +35,14 @@ COMMIT;
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1a;
@@ -51,7 +51,7 @@ connection node_1;
 TRUNCATE TABLE t1;
 SET SESSION wsrep_trx_fragment_size = 10;
 SET SESSION wsrep_trx_fragment_unit = 'bytes';
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=OFF;
@@ -80,14 +80,14 @@ ROLLBACK;
 SELECT * FROM t1;
 f1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT * FROM t1;
 f1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1a;
@@ -96,7 +96,7 @@ connection node_1;
 TRUNCATE TABLE t1;
 SET SESSION wsrep_trx_fragment_size = 200;
 SET SESSION wsrep_trx_fragment_unit = 'bytes';
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 SET AUTOCOMMIT=OFF;
@@ -120,14 +120,14 @@ SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
 connection node_1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
 1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_1a;
diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result
index 7baad138ec7e3..fc9afd6e1e0ea 100644
--- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result
+++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result
@@ -7,7 +7,7 @@ START TRANSACTION;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2);
 connection node_2;
-SELECT flags FROM wsrep_schema.SR;
+SELECT flags FROM mysql.wsrep_streaming_log;
 flags
 1
 0
@@ -15,7 +15,7 @@ connection node_1;
 ROLLBACK;
 INSERT INTO t1 VALUES (3),(4);
 connection node_2;
-SELECT flags FROM wsrep_schema.SR;
+SELECT flags FROM mysql.wsrep_streaming_log;
 flags
 1
 0
diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#93.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#93.result
index 2a60c80c6be1f..17f71213767c0 100644
--- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#93.result
+++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#93.result
@@ -8,11 +8,11 @@ INSERT INTO t1 VALUES (1);
 ROLLBACK TO SAVEPOINT a;
 INSERT INTO t1 values (2);
 COMMIT;
-SELECT COUNT(*) = 0 from wsrep_schema.SR;
+SELECT COUNT(*) = 0 from mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 connection node_2;
-SELECT COUNT(*) = 0 from wsrep_schema.SR;
+SELECT COUNT(*) = 0 from mysql.wsrep_streaming_log;
 COUNT(*) = 0
 1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/GCF-1051.test b/mysql-test/suite/galera_sr/t/GCF-1051.test
index 511cae9378479..122f2827eacfe 100644
--- a/mysql-test/suite/galera_sr/t/GCF-1051.test
+++ b/mysql-test/suite/galera_sr/t/GCF-1051.test
@@ -23,11 +23,11 @@ COMMIT;
 
 --connection node_1
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM .SR;
 
 --connection node_2
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM .SR;
 
 #
 # Test 2: AUTOCOMMIT OFF
@@ -41,11 +41,11 @@ COMMIT;
 
 --connection node_1
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM .SR;
 
 --connection node_2
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM .SR;
 
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/GCF-437.test b/mysql-test/suite/galera_sr/t/GCF-437.test
index 4101bac7446f4..f71be65708e33 100644
--- a/mysql-test/suite/galera_sr/t/GCF-437.test
+++ b/mysql-test/suite/galera_sr/t/GCF-437.test
@@ -13,7 +13,7 @@ SET SESSION wsrep_trx_fragment_size = 2 * 1024 * 1024;
 INSERT INTO t1 (f2) SELECT REPEAT('x', 512) FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
 
 CALL mtr.add_suppression("InnoDB: The total blob data length*");
-CALL mtr.add_suppression("WSREP: Error writing into wsrep_schema.SR: 139");
+CALL mtr.add_suppression("WSREP: Error writing into mysql.wsrep_streaming_log: 139");
 CALL mtr.add_suppression("WSREP: Failed to write to frag table: 1");
 CALL mtr.add_suppression("WSREP: Failed to append frag to persistent storage");
 
diff --git a/mysql-test/suite/galera_sr/t/GCF-561.test b/mysql-test/suite/galera_sr/t/GCF-561.test
index e092e194c1488..4a652284e5948 100644
--- a/mysql-test/suite/galera_sr/t/GCF-561.test
+++ b/mysql-test/suite/galera_sr/t/GCF-561.test
@@ -22,20 +22,20 @@ INSERT INTO t1 VALUES (5, 5);
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) > 0 FROM t1;
 --source include/wait_condition.inc
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 ALTER TABLE t1 DROP COLUMN f2;
 
 # SR applied before the DDL is no longer visible
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 # Transaction can not continue due to DDL, implicit ROLLBACK
 --error ER_LOCK_DEADLOCK
 INSERT INTO t1 VALUES (6, 6);
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # DDL is now in effect
 --error ER_WRONG_VALUE_COUNT_ON_ROW
@@ -60,6 +60,6 @@ COMMIT;
 
 --connection node_2
 SELECT COUNT(*) = 5 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/GCF-571.test b/mysql-test/suite/galera_sr/t/GCF-571.test
index 3ad32493a355f..aca0b9f790760 100644
--- a/mysql-test/suite/galera_sr/t/GCF-571.test
+++ b/mysql-test/suite/galera_sr/t/GCF-571.test
@@ -22,33 +22,33 @@ INSERT INTO t1 VALUES ('xyzxyz');
 
 --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
 --connection node_1a
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%abcdef%';
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%xyz%';
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%SAVEPOINT `A`%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%abcdef%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%xyz%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%SAVEPOINT `A`%';
 
 --connection node_1
 ROLLBACK TO SAVEPOINT A;
 
 --connection node_1a
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%abcdef%';
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%xyz%';
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%SAVEPOINT `A`%';
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%ROLLBACK TO `A`%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%abcdef%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%xyz%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%SAVEPOINT `A`%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%ROLLBACK TO `A`%';
 
 --connection node_2
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%abcdef%';
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR WHERE frag LIKE '%xyz%';
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%SAVEPOINT `A`%';
-SELECT COUNT(*) = 1 FROM wsrep_schema.SR WHERE frag LIKE '%ROLLBACK TO `A`%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%abcdef%';
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%xyz%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%SAVEPOINT `A`%';
+SELECT COUNT(*) = 1 FROM mysql.wsrep_streaming_log WHERE frag LIKE '%ROLLBACK TO `A`%';
 
 --connection node_1
 ROLLBACK;
 
 --connection node_1a
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/GCF-572.test b/mysql-test/suite/galera_sr/t/GCF-572.test
index 8bf57a38fdd81..abefb9b08f694 100644
--- a/mysql-test/suite/galera_sr/t/GCF-572.test
+++ b/mysql-test/suite/galera_sr/t/GCF-572.test
@@ -37,7 +37,7 @@ SET SESSION wsrep_trx_fragment_size = 10000;
 
 START TRANSACTION;
 INSERT INTO t1 VALUE (10, 'node1');
-SELECT * FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
 
 --connection node_1a
 INSERT INTO t1 VALUES(15, 'node2');
diff --git a/mysql-test/suite/galera_sr/t/GCF-580.test b/mysql-test/suite/galera_sr/t/GCF-580.test
index 165b1abcc7afc..39a237fda57a9 100644
--- a/mysql-test/suite/galera_sr/t/GCF-580.test
+++ b/mysql-test/suite/galera_sr/t/GCF-580.test
@@ -16,7 +16,7 @@ INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 
---let $fragments_count = `SELECT COUNT(*) FROM wsrep_schema.SR`
+--let $fragments_count = `SELECT COUNT(*) FROM mysql.wsrep_streaming_log`
 --let $wsrep_last_committed_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
 --disable_query_log
 --eval SELECT ($wsrep_last_committed_after - $wsrep_last_committed_before) = $fragments_count AS last_committed_matches_fragment_count
diff --git a/mysql-test/suite/galera_sr/t/GCF-623.test b/mysql-test/suite/galera_sr/t/GCF-623.test
index daf9eccfa7433..6784989bde942 100644
--- a/mysql-test/suite/galera_sr/t/GCF-623.test
+++ b/mysql-test/suite/galera_sr/t/GCF-623.test
@@ -23,9 +23,9 @@ SELECT COUNT(*) = 0 FROM t1;
 --connection node_1
 --error ER_LOCK_DEADLOCK
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
\ No newline at end of file
diff --git a/mysql-test/suite/galera_sr/t/GCF-627.test b/mysql-test/suite/galera_sr/t/GCF-627.test
index 7c9faff78a86e..86637ad8e7f89 100644
--- a/mysql-test/suite/galera_sr/t/GCF-627.test
+++ b/mysql-test/suite/galera_sr/t/GCF-627.test
@@ -22,9 +22,9 @@ COMMIT;
 INSERT INTO t1 VALUES (2);
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera_sr/t/GCF-845.test b/mysql-test/suite/galera_sr/t/GCF-845.test
index 9651bde014da3..316317c6a108e 100644
--- a/mysql-test/suite/galera_sr/t/GCF-845.test
+++ b/mysql-test/suite/galera_sr/t/GCF-845.test
@@ -14,10 +14,10 @@ DELETE FROM t1 WHERE f1 > 13;
 --sleep 2
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/galera_sr/t/GCF-851.test b/mysql-test/suite/galera_sr/t/GCF-851.test
index a9b7725c1554e..28d5302a422a8 100644
--- a/mysql-test/suite/galera_sr/t/GCF-851.test
+++ b/mysql-test/suite/galera_sr/t/GCF-851.test
@@ -6,16 +6,16 @@ SET SESSION WSREP_TRX_FRAGMENT_SIZE=1;
 SET SESSION AUTOCOMMIT=OFF;
 
 INSERT INTO t1 VALUES (10);
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --connection node_2
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 START TRANSACTION;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) > 0 FROM t1;
 
 --connection node_1
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.inc b/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.inc
index eba84eddb93f2..cd9884cee8102 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.inc
+++ b/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.inc
@@ -132,9 +132,9 @@ if (!$galera_sr_bf_abort_at_commit)
 }
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Delete entery to verify that node is unblocked
 --connection node_1
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 2ea11cd36409c..8ae8c204f609e 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
@@ -26,10 +26,10 @@ INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 #
 # Trigger CC . The transaction is aborted and we expect the SR tables to be cleaned up
@@ -50,7 +50,7 @@ SET SESSION wsrep_sync_wait = DEFAULT;
 INSERT INTO t1 VALUES (6);
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Restore cluster
 
@@ -67,8 +67,8 @@ SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
 --connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2
 --connection node_2b
 --source include/galera_wait_ready.inc
-SELECT * FROM wsrep_schema.SR;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT * FROM mysql.wsrep_streaming_log;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Repeat transaction to confirm no locks are left from previous transaction
 
@@ -81,11 +81,11 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 COMMIT;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 SELECT COUNT(*) = 5 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_cc_slave.test b/mysql-test/suite/galera_sr/t/galera_sr_cc_slave.test
index 148539bf5b09c..72b7aa7585bec 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_cc_slave.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_cc_slave.test
@@ -9,10 +9,10 @@
 
 # Start with a clean slate
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 
 --let $wsrep_trx_fragment_size_orig = `SELECT @@wsrep_trx_fragment_size`
@@ -26,10 +26,10 @@ INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 #
 # Trigger CC . The transaction should be able to continue
@@ -49,7 +49,7 @@ INSERT INTO t1 VALUES (8);
 INSERT INTO t1 VALUES (9);
 INSERT INTO t1 VALUES (10);
 
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 # Restore cluster
 
@@ -61,7 +61,7 @@ SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
 --source include/galera_wait_ready.inc
 
 # Confirm that the SR table still contains entries from ongoing transaction
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 # Continue and finalize transaction
 --connection node_1
@@ -72,7 +72,7 @@ INSERT INTO t1 VALUES (14);
 INSERT INTO t1 VALUES (16);
 COMMIT;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Confirm that transaction was replicated properly
 # and SR table is cleaned up afterwards.
@@ -81,6 +81,6 @@ SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
 --let $wait_condition = SELECT COUNT(*) = 15 FROM t1;
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_ddl_master.test b/mysql-test/suite/galera_sr/t/galera_sr_ddl_master.test
index 105d395df6b55..7da7f55ba15b9 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_ddl_master.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_ddl_master.test
@@ -30,7 +30,7 @@ SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) > 0 FROM t1;
 --source include/wait_condition.inc
 
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
 ALTER TABLE t1 ADD COLUMN f2 INTEGER;
@@ -39,7 +39,7 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
 --error ER_LOCK_DEADLOCK
 INSERT INTO t1 VALUES (6);
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Check that the transaction thus aborted could be reissued
 
@@ -54,10 +54,10 @@ INSERT INTO t1 (f1) VALUES (6);
 COMMIT;
 
 SELECT COUNT(*) = 6 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SELECT COUNT(*) = 6 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_ddl_slave.test b/mysql-test/suite/galera_sr/t/galera_sr_ddl_slave.test
index e092e194c1488..4a652284e5948 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_ddl_slave.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_ddl_slave.test
@@ -22,20 +22,20 @@ INSERT INTO t1 VALUES (5, 5);
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) > 0 FROM t1;
 --source include/wait_condition.inc
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 ALTER TABLE t1 DROP COLUMN f2;
 
 # SR applied before the DDL is no longer visible
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 # Transaction can not continue due to DDL, implicit ROLLBACK
 --error ER_LOCK_DEADLOCK
 INSERT INTO t1 VALUES (6, 6);
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # DDL is now in effect
 --error ER_WRONG_VALUE_COUNT_ON_ROW
@@ -60,6 +60,6 @@ COMMIT;
 
 --connection node_2
 SELECT COUNT(*) = 5 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_ddl_unrelated.test b/mysql-test/suite/galera_sr/t/galera_sr_ddl_unrelated.test
index 49155017d3f46..77b6e64641d3d 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_ddl_unrelated.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_ddl_unrelated.test
@@ -23,13 +23,13 @@ INSERT INTO t1 VALUES (5, 5);
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) > 0 FROM t1;
 --source include/wait_condition.inc
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 ALTER TABLE t2 DROP COLUMN f2;
 
 # SR applied before the DDL is still visible
 SELECT COUNT(*) = 5 FROM t1;
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 
@@ -43,11 +43,11 @@ INSERT INTO t1 VALUES (6, 6);
 
 --connection node_1
 COMMIT;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SELECT COUNT(*) = 6 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_dupkey_error.test b/mysql-test/suite/galera_sr/t/galera_sr_dupkey_error.test
index 45b77a99da11c..a7aca04282990 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_dupkey_error.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_dupkey_error.test
@@ -19,7 +19,7 @@ INSERT INTO t1 VALUES (REPEAT('e', 512));
 INSERT INTO t1 VALUES (REPEAT('f', 512));
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 # Deadlock error instead of dupkey since the transaction is SR and
@@ -27,12 +27,12 @@ INSERT INTO t1 VALUES (REPEAT('f', 512));
 --error ER_LOCK_DEADLOCK
 INSERT INTO t1 VALUES (REPEAT('c', 512));
 
-# Confirm that the wsrep_schema table is now empty, as it was a full transaction rollback
+# Confirm that the wsrep_streaming_log table is now empty, as it was a full transaction rollback
 
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Confirm that the transaction can be restarted on either node
 
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_kill_all_nobootstrap.test b/mysql-test/suite/galera_sr/t/galera_sr_kill_all_nobootstrap.test
index 2730af7f9f453..8fba27f9a73e8 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_kill_all_nobootstrap.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_kill_all_nobootstrap.test
@@ -1,6 +1,6 @@
 #
 # Kill entire cluster during SR while pc.bootstrap is in effect
-# after restart, confirm that the wsrep_schema.SR table is empty
+# after restart, confirm that the mysql.wsrep_streaming_log table is empty
 #
 
 --source include/galera_cluster.inc
@@ -18,7 +18,7 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 --source include/kill_galera.inc
@@ -43,10 +43,10 @@ INSERT INTO t1 VALUES (5);
 --source include/galera_wait_ready.inc
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.test b/mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.test
index dc99521f40e90..042e3d3ef5749 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.test
@@ -1,6 +1,6 @@
 #
 # Kill entire cluster during SR while pc.recovery is NOT in effect
-# after restart, confirm that the wsrep_schema.SR table is empty
+# after restart, confirm that the mysql.wsrep_streaming_log table is empty
 #
 
 --source include/galera_cluster.inc
@@ -18,7 +18,7 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 --source include/kill_galera.inc
@@ -43,11 +43,11 @@ INSERT INTO t1 VALUES (5);
 --source include/galera_wait_ready.inc
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_kill_all_pcrecovery.test b/mysql-test/suite/galera_sr/t/galera_sr_kill_all_pcrecovery.test
index e6b1a9c5d27c5..0ba7cedbd8f6b 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_kill_all_pcrecovery.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_kill_all_pcrecovery.test
@@ -1,6 +1,6 @@
 #
 # Kill entire cluster during SR while pc.recovery is in effect
-# after restart, confirm that the wsrep_schema.SR table is empty
+# after restart, confirm that the mysql.wsrep_streaming_log table is empty
 #
 
 --source include/galera_cluster.inc
@@ -18,7 +18,7 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 --source include/kill_galera.inc
@@ -44,11 +44,11 @@ INSERT INTO t1 VALUES (5);
 --source include/galera_wait_ready.inc
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_kill_query.test b/mysql-test/suite/galera_sr/t/galera_sr_kill_query.test
index fcfc5f30a485d..4c9f2b4d7bc88 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_kill_query.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_kill_query.test
@@ -34,7 +34,7 @@ SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 # Confirm that the kill caused the updates made so far to be removed
 --connection node_2
 SELECT COUNT(*) = 0 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Confirm that the transaction can be reissued in its entirety on the slave without a conflict
 
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_kill_slave.test b/mysql-test/suite/galera_sr/t/galera_sr_kill_slave.test
index 9abce126d44da..a76a03e49b921 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_kill_slave.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_kill_slave.test
@@ -67,12 +67,12 @@ INSERT INTO t1 VALUES (14);
 INSERT INTO t1 VALUES (15);
 COMMIT;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 --sleep 5
 SELECT COUNT(*) = 15 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_large_fragment.test b/mysql-test/suite/galera_sr/t/galera_sr_large_fragment.test
index ca54f9e6851e9..63278555723fa 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_large_fragment.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_large_fragment.test
@@ -18,7 +18,7 @@ START TRANSACTION;
 INSERT INTO t1 (f2) SELECT REPEAT('x', 512) FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
 
 --connection node_2
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) > 50000 FROM t1;
 
@@ -31,7 +31,7 @@ SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT10M';
 SET SESSION wsrep_sync_wait = 7;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 
 --disable_query_log
@@ -43,7 +43,7 @@ SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT10M';
 SET SESSION wsrep_sync_wait = 7;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 
 --disable_query_log
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_many_fragments.test b/mysql-test/suite/galera_sr/t/galera_sr_many_fragments.test
index 424683f03a5c4..9b8dae9d8e39f 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_many_fragments.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_many_fragments.test
@@ -18,7 +18,7 @@ START TRANSACTION;
 INSERT INTO t1 (f2) SELECT REPEAT('x', 512) FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4;
 
 --connection node_2
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) = 10000 FROM t1;
 
@@ -31,7 +31,7 @@ SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT10M';
 SET SESSION wsrep_sync_wait = 7;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 
 --disable_query_log
@@ -43,7 +43,7 @@ SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT10M';
 SET SESSION wsrep_sync_wait = 7;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 
 --disable_query_log
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
index 88249c22f7a6f..25ded94e1005c 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
@@ -24,7 +24,7 @@ UPDATE t1 SET f2 = REPEAT('y', 255);
 
 # Wait for SR replication to kick in
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 # Restart node #2
@@ -53,7 +53,7 @@ UPDATE t1 SET f2 = REPEAT('y', 255);
 
 # Check that node #2 is caught up with the SR transaction that is still in progress
 --connection node_2
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 --let $wait_condition = SELECT COUNT(*) > 0 FROM t1;
 --source include/wait_condition.inc
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_master.test b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_master.test
index 5784b9425f238..3f7407fe53671 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_master.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_master.test
@@ -19,7 +19,7 @@ START TRANSACTION;
 INSERT INTO t1 VALUES (1),(2),(3);
 
 --connection node_1
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 --connection node_2
@@ -29,14 +29,14 @@ INSERT INTO t1 VALUES (1),(2),(3);
 --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
 # Confirm that SR table on slave is empty
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 0 FROM t1;
 
 --connection node_2
 --source include/start_mysqld.inc
 
 # SR table on master should be empty too
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 # Confirm that the INSERT can be re-issued
 INSERT INTO t1 VALUES (1),(2),(3);
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
index 53f6fd7885ce0..fa2df242ccc5e 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
@@ -25,7 +25,7 @@ START TRANSACTION;
 INSERT INTO t1 VALUES (21),(22),(23);
 
 --connection node_2
---let $wait_condition = SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+--let $wait_condition = SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 --source include/wait_condition.inc
 
 --source include/shutdown_mysqld.inc
@@ -43,7 +43,7 @@ COMMIT;
 --source include/start_mysqld.inc
 
 # Confirm SR table on slave has entries
-SELECT COUNT(*) > 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 6 FROM t1 WHERE f1 IN (11,12,13,14,15,16);
 
 # Commit the second transaction on master after the slave has rejoined
@@ -53,11 +53,11 @@ COMMIT;
 
 # Confirm that SR table on slave is empty
 --connection node_2
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 SELECT COUNT(*) = 12 FROM t1;
 
 # SR table on master should be empty too
 --connection node_1
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_transaction_replay.test b/mysql-test/suite/galera_sr/t/galera_sr_transaction_replay.test
index ca20dcdde2479..f44d67e5c8c01 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_transaction_replay.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_transaction_replay.test
@@ -118,7 +118,7 @@ SET SESSION wsrep_sync_wait = 0;
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'b';
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 #
 # wsrep_local_replays has increased by 1
@@ -132,7 +132,7 @@ SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'b';
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DELETE FROM t1;
 
@@ -239,7 +239,7 @@ SET SESSION wsrep_sync_wait = 0;
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'b';
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 #
 # wsrep_local_replays has increased by 1
@@ -253,7 +253,7 @@ SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'b';
 SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 DELETE FROM t1;
 
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test b/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test
index 7f27ab23a04f9..0cf0576583820 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test
@@ -20,7 +20,7 @@ INSERT INTO t1 VALUES (1);
 --connection node_2
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 INSERT INTO t1 VALUES (2);
@@ -28,7 +28,7 @@ INSERT INTO t1 VALUES (2);
 # Expect 2 rows in t1 and 1 fragment in SR table
 --connection node_2
 SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 
  --connection node_1
 INSERT INTO t1 VALUES (3);
@@ -38,17 +38,17 @@ INSERT INTO t1 VALUES (5);
 # Expect 5 rows in t1 and 2 fragments in SR table
 --connection node_2
 SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 COMMIT;
 
 # Expect 5 rows in t1 and empty SR table
 SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM wsrep_schema.SR;
+SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep#215.test b/mysql-test/suite/galera_sr/t/mysql-wsrep#215.test
index 10f1e73bdc74a..81b4a718f6847 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep#215.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep#215.test
@@ -16,7 +16,7 @@
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
 SET SESSION wsrep_trx_fragment_size = 2;
 SET SESSION wsrep_trx_fragment_unit = 'statements';
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --let $expected_cert_failures = `SELECT VARIABLE_VALUE + 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'`
 
 SET AUTOCOMMIT=OFF;
@@ -53,11 +53,11 @@ SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
 COMMIT;
 
 SELECT COUNT(*) = 1 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SELECT COUNT(*) = 1 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1a
 SET DEBUG_SYNC = 'RESET';
@@ -70,7 +70,7 @@ TRUNCATE TABLE t1;
 
 SET SESSION wsrep_trx_fragment_size = 10;
 SET SESSION wsrep_trx_fragment_unit = 'bytes';
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --let $expected_cert_failures = `SELECT VARIABLE_VALUE + 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'`
 
 SET AUTOCOMMIT=OFF;
@@ -105,11 +105,11 @@ SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
 ROLLBACK;
 
 SELECT * FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SELECT * FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1a
 SET DEBUG_SYNC = 'RESET';
@@ -127,7 +127,7 @@ TRUNCATE TABLE t1;
 
 SET SESSION wsrep_trx_fragment_size = 200;
 SET SESSION wsrep_trx_fragment_unit = 'bytes';
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 --let $expected_cert_failures = `SELECT VARIABLE_VALUE + 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'`
 
 SET AUTOCOMMIT=OFF;
@@ -161,11 +161,11 @@ SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
 --reap
 COMMIT;
 
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
 SELECT COUNT(*) = 1 FROM t1;
-SELECT COUNT(*) = 0 FROM wsrep_schema.SR;
+SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1a
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#138.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#138.test
index 2e67e730f79de..3694dc9ad43a5 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#138.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#138.test
@@ -11,14 +11,14 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2);
 
 --connection node_2
-SELECT flags FROM wsrep_schema.SR;
+SELECT flags FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 ROLLBACK;
 INSERT INTO t1 VALUES (3),(4);
 
 --connection node_2
-SELECT flags FROM wsrep_schema.SR;
+SELECT flags FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 ROLLBACK;
diff --git a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#93.test b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#93.test
index ba82473ae7902..442a7113537bf 100644
--- a/mysql-test/suite/galera_sr/t/mysql-wsrep-features#93.test
+++ b/mysql-test/suite/galera_sr/t/mysql-wsrep-features#93.test
@@ -22,8 +22,8 @@ ROLLBACK TO SAVEPOINT a;
 INSERT INTO t1 values (2);
 COMMIT;
 
-SELECT COUNT(*) = 0 from wsrep_schema.SR;
+SELECT COUNT(*) = 0 from mysql.wsrep_streaming_log;
 --connection node_2
-SELECT COUNT(*) = 0 from wsrep_schema.SR;
+SELECT COUNT(*) = 0 from mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/sql/handler.cc b/sql/handler.cc
index 4c69d9f3a5eb9..e10d8c2486d6a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1209,7 +1209,7 @@ void trans_register_ha(THD *thd, bool all, handlerton *ht_arg)
 static int prepare_or_error(handlerton *ht, THD *thd, bool all)
 {
   #ifdef WITH_WSREP
-  if (WSREP(thd) && ht->db_type == DB_TYPE_INNODB &&
+  if (WSREP(thd) && ht->flags & HTON_WSREP_REPLICATION &&
       wsrep_before_prepare(thd, all))
   {
     return(1);
@@ -1223,7 +1223,7 @@ static int prepare_or_error(handlerton *ht, THD *thd, bool all)
       my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
   }
 #ifdef WITH_WSREP
-  if (WSREP(thd) && ht->db_type == DB_TYPE_INNODB &&
+  if (WSREP(thd) && ht->flags & HTON_WSREP_REPLICATION &&
       wsrep_after_prepare(thd, all))
   {
     err= 1;
@@ -1413,9 +1413,6 @@ int ha_commit_trans(THD *thd, bool all)
     DBUG_RETURN(2);
   }
 
-#ifdef WITH_WSREP
-  bool trans_was_empty= true;
-#endif /* WITH_WSREP */
 #ifdef WITH_ARIA_STORAGE_ENGINE
   ha_maria::implicit_commit(thd, TRUE);
 #endif
@@ -1428,7 +1425,7 @@ int ha_commit_trans(THD *thd, bool all)
     if (is_real_trans)
       thd->transaction.cleanup();
 #ifdef WITH_WSREP
-    if (WSREP(thd) && all && !error && trans_was_empty)
+    if (WSREP(thd) && all && !error)
     {
       wsrep_commit_empty(thd, all);
     }
@@ -1518,12 +1515,6 @@ int ha_commit_trans(THD *thd, bool all)
     }
   }
 #endif
-#ifdef WITH_WSREP
-  if (rw_ha_count)
-  {
-    trans_was_empty= false;
-  }
-#endif /* WITH_WSREP */
 
   if (trans->no_2pc || (rw_ha_count <= 1))
   {
@@ -1681,7 +1672,7 @@ int ha_commit_trans(THD *thd, bool all)
     thd->mdl_context.release_lock(mdl_request.ticket);
   }
 #ifdef WITH_WSREP
-  if (WSREP(thd) && all && !error && trans_was_empty)
+  if (WSREP(thd) && all && !error && (rw_ha_count == 0))
   {
     wsrep_commit_empty(thd, all);
   }
@@ -2453,7 +2444,7 @@ int ha_rollback_to_savepoint(THD *thd, SAVEPOINT *sv)
     int err;
     handlerton *ht= ha_info->ht();
 #ifdef WITH_WSREP
-    if (ht->db_type == DB_TYPE_INNODB)
+    if (ht->flags & HTON_WSREP_REPLICATION)
     {
       WSREP_DEBUG("ha_rollback_to_savepoint: run before_rollbackha_rollback_trans hook");
       (void) wsrep_before_rollback(thd, !thd->in_sub_stmt);
@@ -2466,7 +2457,7 @@ int ha_rollback_to_savepoint(THD *thd, SAVEPOINT *sv)
       error=1;
     }
 #ifdef WITH_WSREP
-    if (ht->db_type == DB_TYPE_INNODB)
+    if (ht->flags & HTON_WSREP_REPLICATION)
     {
       WSREP_DEBUG("ha_rollback_to_savepoint: run after_rollback hook");
       (void) wsrep_after_rollback(thd, !thd->in_sub_stmt);
@@ -6279,11 +6270,14 @@ int binlog_log_row(TABLE* table, const uchar *before_record,
   THD *const thd= table->in_use;
 
   /* only InnoDB tables will be replicated through binlog emulation */
-  if ((WSREP_EMULATE_BINLOG(thd) &&
-       table->file->ht->db_type != DB_TYPE_INNODB &&
-       table->file->partition_ht()->db_type != DB_TYPE_INNODB) ||
+  if (WSREP_EMULATE_BINLOG(thd) &&
+      !(table->file->ht->flags & HTON_WSREP_REPLICATION) &&
+      !(table->file->ht->db_type == DB_TYPE_PARTITION_DB &&
+        (((ha_partition*)(table->file))->wsrep_db_type() == DB_TYPE_INNODB)) ||
       (thd->wsrep_ignore_table == true))
-    return 0;
+  {
+      return 0;
+  }
 #endif
 
   if (!table->file->check_table_binlog_row_based(1))
@@ -6752,15 +6746,6 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal)
 
   DBUG_RETURN(0);
 }
-void ha_fake_trx_id(THD *thd)
-{
-  DBUG_ENTER("ha_wsrep_fake_trx_id");
-  if (!WSREP(thd)) 
-  {
-    DBUG_VOID_RETURN;
-  }
-  DBUG_VOID_RETURN;
-}
 #endif /* WITH_WSREP */
 
 
diff --git a/sql/handler.h b/sql/handler.h
index 8297058fad743..c9369e95f3f5c 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1485,7 +1485,6 @@ struct handlerton
 			    THD *victim_thd, my_bool signal);
    int (*set_checkpoint)(handlerton *hton, const XID* xid);
    int (*get_checkpoint)(handlerton *hton, XID* xid);
-   void (*fake_trx_id)(handlerton *hton, THD *thd);
    /*
      Optional clauses in the CREATE/ALTER TABLE
    */
@@ -1682,6 +1681,9 @@ handlerton *ha_default_tmp_handlerton(THD *thd);
 // Engine needs to access the main connect string in partitions
 #define HTON_CAN_READ_CONNECT_STRING_IN_PARTITION (1 <<12)
 
+/* can be replicated by wsrep replication provider plugin */
+#define HTON_WSREP_REPLICATION (1 << 13)
+
 class Ha_trx_info;
 
 struct THD_TRANS
@@ -4843,9 +4845,6 @@ int ha_savepoint(THD *thd, SAVEPOINT *sv);
 int ha_release_savepoint(THD *thd, SAVEPOINT *sv);
 #ifdef WITH_WSREP
 int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal);
-void ha_fake_trx_id(THD *thd);
-#else
-inline void ha_fake_trx_id(THD *thd) { }
 #endif
 
 /* these are called by storage engines */
diff --git a/sql/log.cc b/sql/log.cc
index b12507f8cf544..68e34513d40f4 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1707,7 +1707,6 @@ static int binlog_close_connection(handlerton *hton, THD *thd)
     (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
 #ifdef WITH_WSREP
   if (cache_mngr && !cache_mngr->trx_cache.empty()) {
-    //IO_CACHE* cache= wsrep_get_trans_cache(thd);
     IO_CACHE* cache= cache_mngr->get_binlog_cache_log(true);
     uchar *buf;
     size_t len=0;
@@ -10615,40 +10614,6 @@ maria_declare_plugin_end;
 #include "wsrep_trans_observer.h"
 #include "wsrep_mysqld.h"
 
-static int wsrep_plugin_init(void *p)
-{
-  WSREP_INFO("wsrep_plugin_init()");
-  return (0);
-}
-
-static int wsrep_plugin_deinit(void *p)
-{
-  WSREP_INFO("wsrep_plugin_deinit()");
-  return (0);
-}
-
-struct Mysql_replication wsrep_plugin= {
-  MYSQL_REPLICATION_INTERFACE_VERSION
-};
-
-maria_declare_plugin(wsrep)
-{
-  MYSQL_REPLICATION_PLUGIN,
-  &wsrep_plugin,
-  "wsrep",
-  "Codership Oy",
-  "Wsrep replication plugin",
-  PLUGIN_LICENSE_GPL,
-  wsrep_plugin_init,
-  wsrep_plugin_deinit,
-  0x0100,
-  NULL, /* Status variables */
-  NULL, /* System variables */
-  "1.0", /* Version (string) */
-  MariaDB_PLUGIN_MATURITY_STABLE     /* Maturity */
-}
-maria_declare_plugin_end;
-
 IO_CACHE *wsrep_get_trans_cache(THD * thd)
 {
   DBUG_ASSERT(binlog_hton->slot != HA_SLOT_UNDEF);
@@ -10662,20 +10627,6 @@ IO_CACHE *wsrep_get_trans_cache(THD * thd)
   return NULL;
 }
 
-
-uint wsrep_get_trans_cache_position(THD *thd)
-{
-  if (binlog_hton)
-  {
-    my_off_t pos = 0;
-    binlog_cache_mngr *const cache_mngr= (binlog_cache_mngr*)
-      thd_get_ha_data(thd, binlog_hton);
-    if (cache_mngr) binlog_trans_log_savepos(thd, &pos);
-    return (pos);
-  }
-  return 0;
-}
-
 void wsrep_thd_binlog_trx_reset(THD * thd)
 {
   DBUG_ENTER("wsrep_thd_binlog_trx_reset");
@@ -10712,16 +10663,6 @@ void thd_binlog_rollback_stmt(THD * thd)
     cache_mngr->trx_cache.set_prev_position(MY_OFF_T_UNDEF);
 }
 
-int wsrep_thd_binlog_prepare(THD* thd, bool all)
-{
-  /* applier and replayer can skip binlog prepare */
-  if (WSREP_EMULATE_BINLOG(thd) &&
-      thd->wsrep_cs().mode() == wsrep::client_state::m_local)
-    return binlog_hton->prepare(binlog_hton, thd, all);
-  else
-    return ha_prepare(thd);
-}
-
 bool wsrep_stmt_rollback_is_safe(THD* thd)
 {
   bool ret(true);
diff --git a/sql/log.h b/sql/log.h
index bae48c493ade7..42fcfcc3ab6a5 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -95,11 +95,6 @@ extern PSI_mutex_key key_LOCK_prepare_ordered, key_LOCK_commit_ordered;
 extern PSI_mutex_key key_LOCK_after_binlog_sync;
 extern PSI_cond_key key_COND_prepare_ordered;
 #endif
-#ifdef WITH_WSREP
-int wsrep_thd_binlog_commit(THD *thd, bool all);
-int wsrep_thd_binlog_rollback(THD *thd, bool all);
-int wsrep_thd_binlog_prepare(THD *thd, bool all);
-#endif /* WITH_WSREP */
 
 class TC_LOG_DUMMY: public TC_LOG // use it to disable the logging
 {
@@ -107,11 +102,6 @@ class TC_LOG_DUMMY: public TC_LOG // use it to disable the logging
   TC_LOG_DUMMY() {}
   int open(const char *opt_name)        { return 0; }
   void close()                          { }
-#ifdef WITH_WSREP
-  int commit(THD *thd, bool all) {
-    return wsrep_thd_binlog_commit(thd, all);
-  }
-#endif /* WITH_WSREP */
   /*
     TC_LOG_DUMMY is only used when there are <= 1 XA-capable engines, and we
     only use internal XA during commit when >= 2 XA-capable engines
diff --git a/sql/mdl.cc b/sql/mdl.cc
index 7488af9871387..dc4de74571fd0 100644
--- a/sql/mdl.cc
+++ b/sql/mdl.cc
@@ -1732,31 +1732,39 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg,
   {
     if (! (m_granted.bitmap() & granted_incompat_map))
       can_grant= TRUE;
-#ifdef WITH_WSREP
     else
     {
       Ticket_iterator it(m_granted);
       MDL_ticket *ticket;
-      bool  wsrep_can_grant= TRUE;
+#ifdef WITH_WSREP
+      can_grant = TRUE;
+#endif /* WITH_WSREP */
 
       /* Check that the incompatible lock belongs to some other context. */
       while ((ticket= it++))
       {
         if (ticket->get_ctx() != requestor_ctx &&
             ticket->is_incompatible_when_granted(type_arg))
+#ifdef WITH_WSREP
         {
-	    if ((wsrep_thd_is_toi(requestor_ctx->get_thd()) ||
-		 wsrep_thd_is_applying(requestor_ctx->get_thd())) &&
-		key.mdl_namespace() == MDL_key::BACKUP)
-            {
+          /* non WSREP threads must will report conflict immediately
+             note: RSU processing wsrep threads, have wsrep_on==OFF
+          */
+          if (!WSREP(requestor_ctx->get_thd()) &&
+              requestor_ctx->get_thd()->wsrep_cs().mode() !=
+              wsrep::client_state::m_rsu)
+            break;
+          if ((wsrep_thd_is_toi(requestor_ctx->get_thd()) ||
+               wsrep_thd_is_applying(requestor_ctx->get_thd())) &&
+              key.mdl_namespace() == MDL_key::BACKUP)
+          {
             WSREP_DEBUG("global lock granted for BF: %lu %s",
                         thd_get_thread_id(requestor_ctx->get_thd()),
                         wsrep_thd_query(requestor_ctx->get_thd()));
-            can_grant = true;
           }
-          else if (!wsrep_grant_mdl_exception(requestor_ctx, ticket, &key))
+          else
           {
-            wsrep_can_grant= FALSE;
+            wsrep_handle_mdl_conflict(requestor_ctx, ticket, &key);
             if (wsrep_log_conflicts)
             {
               MDL_lock * lock = ticket->get_lock();
@@ -1765,29 +1773,22 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg,
                          lock->key.db_name(), lock->key.name(), ticket->get_type(),
                          "abort" );
             }
+            can_grant= FALSE;
           }
-        }
-      }
-      if (wsrep_can_grant)
-        can_grant= TRUE;
-    }
+	}
 #else
-    else
-    {
-      Ticket_iterator it(m_granted);
-      MDL_ticket *ticket;
-
-      /* Check that the incompatible lock belongs to some other context. */
-      while ((ticket= it++))
-      {
-        if (ticket->get_ctx() != requestor_ctx &&
-            ticket->is_incompatible_when_granted(type_arg))
           break;
+#endif /* WITH_WSREP */
       }
+#ifdef WITH_WSREP
+      if (!WSREP(requestor_ctx->get_thd()) &&
+          requestor_ctx->get_thd()->wsrep_cs().mode() != wsrep::client_state::m_rsu &&
+          (ticket == NULL))             /* Incompatible locks are our own. */
+#else
       if (ticket == NULL)             /* Incompatible locks are our own. */
+#endif /* WITH_WSREP */
         can_grant= TRUE;
     }
-#endif /* WITH_WSREP */
   }
 #ifdef WITH_WSREP
   else
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e2e8fe78b67c2..fb2e24b22bc4b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2797,14 +2797,6 @@ void signal_thd_deleted()
     mysql_cond_broadcast(&COND_thread_count);
     mysql_mutex_unlock(&LOCK_thread_count);
   }
-  else
-  {
-    /* Naah, I signal anyways */
-    WSREP_DEBUG("forced signal for COND_thread_count");
-    mysql_mutex_lock(&LOCK_thread_count);
-    mysql_cond_broadcast(&COND_thread_count);
-    mysql_mutex_unlock(&LOCK_thread_count);
-  }
 }
 
 
diff --git a/sql/sql_basic_types.h b/sql/sql_basic_types.h
index 4aab29e16d954..a790b68fc0cba 100644
--- a/sql/sql_basic_types.h
+++ b/sql/sql_basic_types.h
@@ -20,8 +20,6 @@
 #ifndef SQL_TYPES_INCLUDED
 #define SQL_TYPES_INCLUDED
 
-#include <my_global.h>
-
 typedef ulonglong sql_mode_t;
 typedef int64 query_id_t;
 
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in
index 6a491a3e7bb98..39911e8d3d836 100644
--- a/sql/sql_builtin.cc.in
+++ b/sql/sql_builtin.cc.in
@@ -32,9 +32,6 @@ extern
 builtin_maria_plugin 
   @mysql_mandatory_plugins@ @mysql_optional_plugins@
   builtin_maria_binlog_plugin,
-#ifdef WITH_WSREP
-  builtin_maria_wsrep_plugin,
-#endif /* WITH_WSREP */
  builtin_maria_mysql_password_plugin;
 
 struct st_maria_plugin *mysql_optional_plugins[]=
@@ -45,8 +42,5 @@ struct st_maria_plugin *mysql_optional_plugins[]=
 struct st_maria_plugin *mysql_mandatory_plugins[]=
 {
   builtin_maria_binlog_plugin, builtin_maria_mysql_password_plugin,
-#ifdef WITH_WSREP
-  builtin_maria_wsrep_plugin,
-#endif /* WITH_WSREP */
   @mysql_mandatory_plugins@ 0
 };
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 5361a058636dd..51fbe1f3476d0 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -804,7 +804,6 @@ THD::THD(my_thread_id id, bool is_wsrep_applier, bool skip_global_sys_var_lock)
   wsrep_has_ignored_error = false;
   m_wsrep_next_trx_id       = WSREP_UNDEFINED_TRX_ID;
   wsrep_replicate_GTID    = false;
-  wsrep_skip_wsrep_GTID   = false;
 #endif
   /* Call to init() below requires fully initialized Open_tables_state. */
   reset_open_tables_state(this);
@@ -1270,7 +1269,6 @@ void THD::init(bool skip_lock)
   wsrep_affected_rows     = 0;
   m_wsrep_next_trx_id     = WSREP_UNDEFINED_TRX_ID;
   wsrep_replicate_GTID    = false;
-  wsrep_skip_wsrep_GTID   = false;
 #endif /* WITH_WSREP */
 
   if (variables.sql_log_bin)
@@ -1493,7 +1491,6 @@ void THD::cleanup(void)
   DBUG_ASSERT(cleanup_done == 0);
 
   set_killed(KILL_CONNECTION);
-  DEBUG_SYNC(this, "thd_cleanup_start");
 #ifdef ENABLE_WHEN_BINLOG_WILL_BE_ABLE_TO_PREPARE
   if (transaction.xid_state.xa_state == XA_PREPARED)
   {
diff --git a/sql/sql_class.h b/sql/sql_class.h
index ffd7b5d6270fe..4aea039f2dc49 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4824,7 +4824,6 @@ class THD :public Statement,
   ulong                     wsrep_affected_rows;
   bool                      wsrep_has_ignored_error;
   bool                      wsrep_replicate_GTID;
-  bool                      wsrep_skip_wsrep_GTID;
 
   /*
     When enabled, do not replicate/binlog updates from the current table that's
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 19fe7bfd81c4b..c95ef72a3088e 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -118,7 +118,7 @@ static bool wsrep_load_data_split(THD *thd, const TABLE *table,
 
   if (handlerton* hton= thd->transaction.stmt.ha_list->next()->ht())
   {
-    if (hton->db_type != DB_TYPE_INNODB)
+    if (!(hton->flags & HTON_WSREP_REPLICATION))
       DBUG_RETURN(false);
     WSREP_DEBUG("intermediate transaction commit in LOAD DATA");
     wsrep_tc_log_commit(thd);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 2021c688d2361..8ad8b6b974288 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1222,12 +1222,7 @@ bool do_command(THD *thd)
 {
   bool return_value;
   char *packet= 0;
-#ifdef WITH_WSREP
-  ulong packet_length= 0; // just to avoid (false positive) compiler warning
-  int err;
-#else
   ulong packet_length;
-#endif /* WITH_WSREP */
   NET *net= &thd->net;
   enum enum_server_command command;
   DBUG_ENTER("do_command");
@@ -1329,13 +1324,11 @@ bool do_command(THD *thd)
   command= fetch_command(thd, packet);
 
 #ifdef WITH_WSREP
-  err= wsrep_before_command(thd);
-  WSREP_DEBUG("wsrep_before_command %d", err);
   /*
     Aborted by background rollbacker thread.
     Handle error here and jump straight to out
   */
-  if (err)
+  if (wsrep_before_command(thd))
   {
     thd->store_globals();
     WSREP_LOG_THD(thd, "enter found BF aborted");
diff --git a/sql/sql_parse.h b/sql/sql_parse.h
index ef8f2a11ee0b8..6604ffa27fd51 100644
--- a/sql/sql_parse.h
+++ b/sql/sql_parse.h
@@ -41,8 +41,6 @@ int test_if_data_home_dir(const char *dir);
 int error_if_data_home_dir(const char *path, const char *what);
 my_bool net_allocate_new_packet(NET *net, void *thd, uint my_flags);
 
-bool stmt_causes_implicit_commit(const THD *thd, uint mask);
-
 bool multi_update_precheck(THD *thd, TABLE_LIST *tables);
 bool multi_delete_precheck(THD *thd, TABLE_LIST *tables);
 int mysql_multi_update_prepare(THD *thd);
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 26741187efc02..dd5f633b3a821 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2611,9 +2611,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
           /* Chop of the last comma */
           built_non_trans_tmp_query.chop();
           built_non_trans_tmp_query.append(" /* generated by server */");
-#ifdef WITH_WSREP
-          thd->wsrep_skip_wsrep_GTID = true;
-#endif /* WITH_WSREP */
           error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
                                      built_non_trans_tmp_query.ptr(),
                                      built_non_trans_tmp_query.length(),
@@ -2626,9 +2623,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
           /* Chop of the last comma */
           built_trans_tmp_query.chop();
           built_trans_tmp_query.append(" /* generated by server */");
-#ifdef WITH_WSREP
-          thd->wsrep_skip_wsrep_GTID = true;
-#endif /* WITH_WSREP */
           error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
                                      built_trans_tmp_query.ptr(),
                                      built_trans_tmp_query.length(),
@@ -2643,9 +2637,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
           built_query.append(" /* generated by server */");
           int error_code = non_tmp_error ?  thd->get_stmt_da()->sql_errno()
                                          : 0;
-#ifdef WITH_WSREP
-          thd->wsrep_skip_wsrep_GTID = true;
-#endif /* WITH_WSREP */
           error |= thd->binlog_query(THD::STMT_QUERY_TYPE,
                                      built_query.ptr(),
                                      built_query.length(),
@@ -2694,9 +2685,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
   }
 
 end:
-#ifdef WITH_WSREP
-        thd->wsrep_skip_wsrep_GTID = false;
-#endif /* WITH_WSREP */
   DBUG_RETURN(error);
 }
 
diff --git a/sql/table.cc b/sql/table.cc
index 653c07c6d6331..01f96b5f93b17 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -248,8 +248,8 @@ TABLE_CATEGORY get_table_category(const LEX_CSTRING *db,
   DBUG_ASSERT(name != NULL);
 
 #ifdef WITH_WSREP
-  if (my_strcasecmp(system_charset_info, db->str, "wsrep_schema") == 0 &&
-      my_strcasecmp(system_charset_info, name->str, "SR") == 0)
+  if (my_strcasecmp(system_charset_info, db->str, "mysql") == 0 &&
+      my_strcasecmp(system_charset_info, name->str, "wsrep_streaming_log") == 0)
   {
     return TABLE_CATEGORY_INFORMATION;
   }
diff --git a/sql/transaction.cc b/sql/transaction.cc
index 84040ca0af95c..4d61d2a120d7f 100644
--- a/sql/transaction.cc
+++ b/sql/transaction.cc
@@ -419,7 +419,6 @@ bool trans_rollback(THD *thd)
 #ifdef HAVE_REPLICATION
   repl_semisync_master.wait_after_rollback(thd, FALSE);
 #endif
-  //(void) RUN_HOOK(transaction, after_rollback, (thd, FALSE));
   thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG);
   /* Reset the binlog transaction marker */
   thd->variables.option_bits&= ~OPTION_GTID_BEGIN;
diff --git a/sql/wsrep_binlog.h b/sql/wsrep_binlog.h
index eae824f07800f..4cef38c85d3cb 100644
--- a/sql/wsrep_binlog.h
+++ b/sql/wsrep_binlog.h
@@ -51,7 +51,6 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf,
                                     size_t buf_len);
 
 int wsrep_binlog_close_connection(THD* thd);
-uint wsrep_get_trans_cache_position(THD *thd);
 
 /**
    Write a skip event into binlog.
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index e0e0f403d0f3a..603c435271f59 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -2206,16 +2206,15 @@ void wsrep_end_nbo_lock(THD* thd, const TABLE_LIST *table_list)
   @retval FALSE  Lock request cannot be granted
 */
 
-bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
+void wsrep_handle_mdl_conflict(MDL_context *requestor_ctx,
                                MDL_ticket *ticket,
                                const MDL_key *key)
 {
   /* Fallback to the non-wsrep behaviour */
-  if (!WSREP_ON) return FALSE;
+  if (!WSREP_ON) return;
 
   THD *request_thd= requestor_ctx->get_thd();
   THD *granted_thd= ticket->get_ctx()->get_thd();
-  bool ret= false;
 
   const char* schema= key->db_name();
   int schema_len= key->db_name_length();
@@ -2240,7 +2239,6 @@ bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
                       schema, schema_len, request_thd, granted_thd);
         mysql_mutex_unlock(&granted_thd->LOCK_thd_data);
         wsrep_abort_thd((void*)request_thd, (void*)granted_thd, 1);
-        ret= FALSE;
       }
       else
       {
@@ -2248,7 +2246,7 @@ bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
                       request_thd, granted_thd);
         ticket->wsrep_report(true);
         mysql_mutex_unlock(&granted_thd->LOCK_thd_data);
-        ret= TRUE;
+        unireg_abort(1);
       }
     }
     else if (granted_thd->lex->sql_command == SQLCOM_FLUSH ||
@@ -2257,7 +2255,6 @@ bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
       WSREP_DEBUG("BF thread waiting for FLUSH");
       ticket->wsrep_report(wsrep_debug);
       mysql_mutex_unlock(&granted_thd->LOCK_thd_data);
-      ret= FALSE;
     }
     else if (request_thd->lex->sql_command == SQLCOM_DROP_TABLE)
     {
@@ -2266,7 +2263,6 @@ bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
       ticket->wsrep_report(wsrep_debug);
       mysql_mutex_unlock(&granted_thd->LOCK_thd_data);
       wsrep_abort_thd((void*)request_thd, (void*)granted_thd, 1);
-      ret= FALSE;
     }
     else
     {
@@ -2277,7 +2273,6 @@ bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
       {
         mysql_mutex_unlock(&granted_thd->LOCK_thd_data);
         wsrep_abort_thd(request_thd, granted_thd, 1);
-        ret= FALSE;
       }
       else
       {
@@ -2289,12 +2284,13 @@ bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
         if (wsrep_thd_is_BF(request_thd, FALSE))
         {
           ha_abort_transaction(request_thd, granted_thd, TRUE);
-          ret= FALSE;
         }
         else
         {
-          DBUG_ASSERT(0);
-          ret= TRUE;
+	  WSREP_MDL_LOG(INFO, "MDL unknown BF-BF conflict", schema, schema_len,
+                      request_thd, granted_thd);
+	  ticket->wsrep_report(true);
+	  unireg_abort(1);
         }
       }
     }
@@ -2303,7 +2299,6 @@ bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
   {
     mysql_mutex_unlock(&request_thd->LOCK_thd_data);
   }
-  return ret;
 }
 
 /**/
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h
index 950e3e3909346..95bbcc3a7479b 100644
--- a/sql/wsrep_mysqld.h
+++ b/sql/wsrep_mysqld.h
@@ -477,8 +477,8 @@ bool wsrep_prepare_keys_for_isolation(THD*              thd,
                                       wsrep_key_arr_t*  ka);
 void wsrep_keys_free(wsrep_key_arr_t* key_arr);
 
-extern bool
-wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
+extern void
+wsrep_handle_mdl_conflict(MDL_context *requestor_ctx,
                           MDL_ticket *ticket,
                           const MDL_key *key);
 IO_CACHE * get_trans_log(THD * thd);
diff --git a/sql/wsrep_plugin.cc b/sql/wsrep_plugin.cc
index dd8095e3843fe..83618a5063718 100644
--- a/sql/wsrep_plugin.cc
+++ b/sql/wsrep_plugin.cc
@@ -34,7 +34,7 @@ struct Mysql_replication wsrep_plugin= {
   MYSQL_REPLICATION_INTERFACE_VERSION
 };
 
-mysql_declare_plugin(wsrep)
+maria_declare_plugin(wsrep)
 {
   MYSQL_REPLICATION_PLUGIN,
   &wsrep_plugin,
@@ -47,7 +47,7 @@ mysql_declare_plugin(wsrep)
   0x0100,
   NULL, /* Status variables */
   NULL, /* System variables */
-  NULL, /* Config options */
-  0     /* Flags */
+  "1.0", /* Version (string) */
+  MariaDB_PLUGIN_MATURITY_STABLE     /* Maturity */
 }
-mysql_declare_plugin_end;
+maria_declare_plugin_end;
diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc
index 73a6d5ec8ad65..19db7203eb82f 100644
--- a/sql/wsrep_schema.cc
+++ b/sql/wsrep_schema.cc
@@ -35,12 +35,13 @@
 #include <sstream>
 
 
-const std::string wsrep_schema_str= "wsrep_schema";
-static const std::string create_wsrep_schema_str=
-  "CREATE DATABASE IF NOT EXISTS wsrep_schema";
+const std::string wsrep_schema_str= "mysql";
+
+static const std::string cluster_str= "wsrep_cluster";
+static const std::string cluster_members_str= "wsrep_cluster_members";
 
 static const std::string create_cluster_table_str=
-  "CREATE TABLE IF NOT EXISTS wsrep_schema.cluster"
+  "CREATE TABLE IF NOT EXISTS mysql.wsrep_cluster"
   "("
   "cluster_uuid CHAR(36) PRIMARY KEY,"
   "view_id BIGINT NOT NULL,"
@@ -50,7 +51,7 @@ static const std::string create_cluster_table_str=
   ") ENGINE=InnoDB";
 
 static const std::string create_members_table_str=
-  "CREATE TABLE IF NOT EXISTS wsrep_schema.members"
+  "CREATE TABLE IF NOT EXISTS mysql.wsrep_cluster_members"
   "("
   "node_uuid CHAR(36) PRIMARY KEY,"
   "cluster_uuid CHAR(36) NOT NULL,"
@@ -59,8 +60,9 @@ static const std::string create_members_table_str=
   ") ENGINE=InnoDB";
 
 #ifdef WSREP_SCHEMA_MEMBERS_HISTORY
+static const std::string cluster_member_history_str= "wsrep_cluster_member_history";
 static const std::string create_members_history_table_str=
-  "CREATE TABLE IF NOT EXISTS wsrep_schema.members_history"
+  "CREATE TABLE IF NOT EXISTS mysql.wsrep_cluster_member_history"
   "("
   "node_uuid CHAR(36) PRIMARY KEY,"
   "cluster_uuid CHAR(36) NOT NULL,"
@@ -71,7 +73,7 @@ static const std::string create_members_history_table_str=
   ") ENGINE=InnoDB";
 #endif /* WSREP_SCHEMA_MEMBERS_HISTORY */
 
-static const std::string sr_table_str= "SR";
+static const std::string sr_table_str= "wsrep_streaming_log";
 const std::string sr_table_name_full_str= wsrep_schema_str + "/" + sr_table_str;
 static const std::string create_frag_table_str=
   "CREATE TABLE IF NOT EXISTS " + wsrep_schema_str + "." + sr_table_str +
@@ -85,10 +87,10 @@ static const std::string create_frag_table_str=
   ") ENGINE=InnoDB";
 
 static const std::string delete_from_cluster_table=
-  "DELETE FROM wsrep_schema.cluster";
+  "DELETE FROM mysql.wsrep_cluster";
 
 static const std::string delete_from_members_table=
-  "DELETE FROM wsrep_schema.members";
+  "DELETE FROM mysql.wsrep_cluster_members";
 
 
 namespace Wsrep_schema_impl
@@ -220,7 +222,6 @@ static int open_table(THD* thd,
 
 
 static int open_for_write(THD* thd, const char* table_name, TABLE** table) {
-  //  LEX_CSTRING schema_str= { C_STRING_WITH_LEN(wsrep_schema_str.c_str()) };
   LEX_CSTRING schema_str= { wsrep_schema_str.c_str(), wsrep_schema_str.length() };
   LEX_CSTRING table_str= { table_name, strlen(table_name) };
   if (Wsrep_schema_impl::open_table(thd, &schema_str, &table_str, TL_WRITE,
@@ -378,7 +379,6 @@ static int delete_row(TABLE* table) {
 }
 
 static int open_for_read(THD* thd, const char* table_name, TABLE** table) {
-  //  LEX_CSTRING schema_str= { C_STRING_WITH_LEN(wsrep_schema_str.c_str()) };
 
   LEX_CSTRING schema_str= { wsrep_schema_str.c_str(), wsrep_schema_str.length() };
   LEX_CSTRING table_str= { table_name, strlen(table_name) };
@@ -525,21 +525,6 @@ static int init_for_index_scan(TABLE* table, const uchar* key,
   return error;
 }
 
-/*
-  Scan next index record. For return codes see handler::ha_index_next()
-
-  @return 0 in case of success, error code in case of error
- */
-/*
-static int next_index_record(TABLE* table) {
-  int error;
-  if ((error= table->file->ha_index_next(table->record[0])) &&
-      error != HA_ERR_END_OF_FILE) {
-    WSREP_ERROR("Failed to read next record: %d", error);
-  }
-  return error;
-}
-*/
 /*
   End index scan.
 
@@ -585,9 +570,7 @@ int Wsrep_schema::init()
     DBUG_RETURN(1);
   }
 
-  if (Wsrep_schema_impl::execute_SQL(thd, create_wsrep_schema_str.c_str(),
-                                     create_wsrep_schema_str.size()) ||
-      Wsrep_schema_impl::execute_SQL(thd, create_cluster_table_str.c_str(),
+  if (Wsrep_schema_impl::execute_SQL(thd, create_cluster_table_str.c_str(),
                                      create_cluster_table_str.size()) ||
       Wsrep_schema_impl::execute_SQL(thd, create_members_table_str.c_str(),
                                      create_members_table_str.size()) ||
@@ -639,7 +622,7 @@ int Wsrep_schema::store_view(THD* thd, const Wsrep_view& view)
     Store cluster view info
   */
   Wsrep_schema_impl::init_stmt(thd);
-  if (Wsrep_schema_impl::open_for_write(thd, "cluster", &cluster_table))
+  if (Wsrep_schema_impl::open_for_write(thd, cluster_str.c_str(), &cluster_table))
   {
     goto out;
   }
@@ -662,7 +645,8 @@ int Wsrep_schema::store_view(THD* thd, const Wsrep_view& view)
     Store info about current members
   */
   Wsrep_schema_impl::init_stmt(thd);
-  if (Wsrep_schema_impl::open_for_write(thd, "members", &members_table))
+  if (Wsrep_schema_impl::open_for_write(thd, cluster_members_str.c_str(),
+                                        &members_table))
   {
     WSREP_ERROR("failed to open wsrep.members table");
     goto out;
@@ -687,7 +671,7 @@ int Wsrep_schema::store_view(THD* thd, const Wsrep_view& view)
     Store members history
   */
   Wsrep_schema_impl::init_stmt(thd);
-  if (Wsrep_schema_impl::open_for_write(thd, "members_history",
+  if (Wsrep_schema_impl::open_for_write(thd, cluster_member_history.c_str(),
                                         &members_history_table)) {
     WSREP_ERROR("failed to open wsrep.members table");
     goto out;
@@ -703,7 +687,7 @@ int Wsrep_schema::store_view(THD* thd, const Wsrep_view& view)
     Wsrep_schema_impl::store(members_history_table, 5,
                              view.members()[i].incoming());
     if ((error= Wsrep_schema_impl::update_or_insert(members_history_table))) {
-      WSREP_ERROR("failed to write wsrep.members table: %d", error);
+      WSREP_ERROR("failed to write wsrep_cluster_member_history table: %d", error);
       goto out;
     }
   }
@@ -748,7 +732,7 @@ Wsrep_view Wsrep_schema::restore_view(THD* thd, const Wsrep_id& own_id) const {
     Read cluster info from cluster table
    */
   Wsrep_schema_impl::init_stmt(thd);
-  if (Wsrep_schema_impl::open_for_read(thd, "cluster", &cluster_table) ||
+  if (Wsrep_schema_impl::open_for_read(thd, cluster_str.c_str(), &cluster_table) ||
       Wsrep_schema_impl::init_for_scan(cluster_table)) {
     goto out;
   }
@@ -773,7 +757,7 @@ Wsrep_view Wsrep_schema::restore_view(THD* thd, const Wsrep_id& own_id) const {
     Read members from members table
   */
   Wsrep_schema_impl::init_stmt(thd);
-  if (Wsrep_schema_impl::open_for_read(thd, "members", &members_table) ||
+  if (Wsrep_schema_impl::open_for_read(thd, cluster_members_str.c_str(), &members_table) ||
       Wsrep_schema_impl::init_for_scan(members_table)) {
     goto out;
   }
@@ -871,7 +855,7 @@ int Wsrep_schema::append_fragment(THD* thd,
   Wsrep_schema_impl::init_stmt(thd);
 
   TABLE* frag_table= 0;
-  if (Wsrep_schema_impl::open_for_write(thd, "SR", &frag_table))
+  if (Wsrep_schema_impl::open_for_write(thd, sr_table_str.c_str(), &frag_table))
   {
     trans_rollback_stmt(thd);
     DBUG_RETURN(1);
@@ -913,7 +897,7 @@ int Wsrep_schema::update_fragment_meta(THD* thd,
   TABLE* frag_table= 0;
 
   Wsrep_schema_impl::init_stmt(thd);
-  if (Wsrep_schema_impl::open_for_write(thd, "SR", &frag_table))
+  if (Wsrep_schema_impl::open_for_write(thd, sr_table_str.c_str(), &frag_table))
   {
     DBUG_RETURN(1);
   }
@@ -1038,7 +1022,7 @@ int Wsrep_schema::remove_fragments(THD* thd,
   thd->reset_n_backup_open_tables_state(&open_tables_backup);
   TABLE_LIST tables;
   LEX_CSTRING schema_str= { wsrep_schema_str.c_str(), wsrep_schema_str.length() };
-  LEX_CSTRING table_str= { "SR", strlen("SR") };
+  LEX_CSTRING table_str= { sr_table_str.c_str(), sr_table_str.length() };
   tables.init_one_table(&schema_str,
                         &table_str, 0, TL_WRITE);
 
@@ -1110,7 +1094,7 @@ int Wsrep_schema::replay_transaction(THD* thd,
        i != fragments.end(); ++i)
   {
     Wsrep_schema_impl::init_stmt(thd);
-    if ((error= Wsrep_schema_impl::open_for_read(thd, "SR", &frag_table)))
+    if ((error= Wsrep_schema_impl::open_for_read(thd, sr_table_str.c_str(), &frag_table)))
     {
       WSREP_WARN("Could not open SR table for read: %d", error);
       Wsrep_schema_impl::finish_stmt(thd);
@@ -1205,7 +1189,7 @@ int Wsrep_schema::recover_sr_transactions()
   Wsrep_schema_impl::init_stmt(&storage_thd);
   storage_thd.wsrep_skip_locking= FALSE;
   if (Wsrep_schema_impl::open_for_read(&storage_thd,
-                                       "cluster", &cluster_table) ||
+                                       cluster_str.c_str(), &cluster_table) ||
       Wsrep_schema_impl::init_for_scan(cluster_table))
   {
     Wsrep_schema_impl::finish_stmt(&storage_thd);
@@ -1239,7 +1223,7 @@ int Wsrep_schema::recover_sr_transactions()
 
   storage_thd.wsrep_skip_locking= TRUE;
   Wsrep_schema_impl::init_stmt(&storage_thd);
-  if (Wsrep_schema_impl::open_for_read(&storage_thd, "SR", &frag_table) ||
+  if (Wsrep_schema_impl::open_for_read(&storage_thd, sr_table_str.c_str(), &frag_table) ||
       Wsrep_schema_impl::init_for_scan(frag_table))
   {
     WSREP_ERROR("Failed to open SR table for read");
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index c371f6b270cfc..c7981cec34f9d 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1835,15 +1835,13 @@ thd_to_trx_id(
 {
 	return(thd_to_trx(thd)->id);
 }
-#endif /* WITH_WSREP */
 
-#ifdef WITH_WSREP
 static int
 wsrep_abort_transaction(handlerton* hton, THD *bf_thd, THD *victim_thd,
 			my_bool signal);
 static int innobase_wsrep_set_checkpoint(handlerton* hton, const XID* xid);
 static int innobase_wsrep_get_checkpoint(handlerton* hton, XID* xid);
-#endif
+#endif /* WITH_WSREP */
 /********************************************************************//**
 Increments innobase_active_counter and every INNOBASE_WAKE_INTERVALth
 time calls srv_active_wake_master_thread. This function should be used
@@ -4160,13 +4158,12 @@ static int innodb_init(void* p)
 	innobase_hton->show_status = innobase_show_status;
 	innobase_hton->flags =
 		HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS
-		| HTON_NATIVE_SYS_VERSIONING;
+		| HTON_NATIVE_SYS_VERSIONING | HTON_WSREP_REPLICATION;
 
 #ifdef WITH_WSREP
 	innobase_hton->abort_transaction=wsrep_abort_transaction;
 	innobase_hton->set_checkpoint=innobase_wsrep_set_checkpoint;
 	innobase_hton->get_checkpoint=innobase_wsrep_get_checkpoint;
-	innobase_hton->fake_trx_id=NULL;
 #endif /* WITH_WSREP */
 
 	innobase_hton->tablefile_extensions = ha_innobase_exts;