diff --git a/mysql-test/suite/multi_source/info_logs.test b/mysql-test/suite/multi_source/info_logs.test index b4bbe7af385..73e6ee73722 100644 --- a/mysql-test/suite/multi_source/info_logs.test +++ b/mysql-test/suite/multi_source/info_logs.test @@ -2,6 +2,8 @@ # Check log files with multi-source # +--source include/not_embedded.inc + --connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3) --let $datadir = `SELECT @@datadir` diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result index 61495e2fce2..c4fb7123e81 100644 --- a/mysql-test/suite/multi_source/multisource.result +++ b/mysql-test/suite/multi_source/multisource.result @@ -108,13 +108,13 @@ i f1 4 four show relaylog events; Log_name Pos Event_type Server_id End_log_pos Info -mysqld-relay-bin.000001 4 Format_desc 3 246 Server ver: 10.0.0-MariaDB-debug-log, Binlog ver: 4 +mysqld-relay-bin.000001 4 Format_desc 3 246 Server version mysqld-relay-bin.000001 246 Rotate 3 296 mysqld-relay-bin.000002;pos=4 show relaylog events in 'mysqld-relay-bin.000002'; Log_name Pos Event_type Server_id End_log_pos Info -mysqld-relay-bin.000002 4 Format_desc 3 246 Server ver: 10.0.0-MariaDB-debug-log, Binlog ver: 4 +mysqld-relay-bin.000002 4 Format_desc 3 246 Server version mysqld-relay-bin.000002 246 Rotate 2 0 master-bin.000001;pos=4 -mysqld-relay-bin.000002 290 Format_desc 2 246 Server ver: 10.0.0-MariaDB-debug-log, Binlog ver: 4 +mysqld-relay-bin.000002 290 Format_desc 2 246 Server version mysqld-relay-bin.000002 532 Binlog_checkpoint 2 286 master-bin.000001 mysqld-relay-bin.000002 572 Query 2 375 drop database if exists db2 mysqld-relay-bin.000002 661 Query 2 456 create database db2 @@ -122,7 +122,7 @@ mysqld-relay-bin.000002 742 Query 2 591 use `db2`; create table t1 (pk int auto_ mysqld-relay-bin.000002 877 Query 2 658 BEGIN mysqld-relay-bin.000002 944 Intvar 2 686 INSERT_ID=1 mysqld-relay-bin.000002 972 Query 2 782 use `db2`; insert into t1 (f1) values (1),(2) -mysqld-relay-bin.000002 1068 Xid 2 809 COMMIT /* xid=25 */ +mysqld-relay-bin.000002 1068 Xid 2 809 COMMIT /* xid= */ stop slave io_thread; show status like 'Slave_running'; Variable_name Value diff --git a/mysql-test/suite/multi_source/multisource.test b/mysql-test/suite/multi_source/multisource.test index df5309624bd..b9d26478282 100644 --- a/mysql-test/suite/multi_source/multisource.test +++ b/mysql-test/suite/multi_source/multisource.test @@ -1,3 +1,9 @@ +# +# Test basic replication functionality +# in multi-source setup +# + +--source include/not_embedded.inc --source include/have_innodb.inc --connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3) @@ -57,9 +63,9 @@ select * from db1.t1; # Check that relay logs are recognizable ---replace_regex /Server ver:.*/Server version/ +--replace_regex /Server ver:.*/Server version/ /xid=[0-9]+/xid=/ show relaylog events; ---replace_regex /Server ver:.*/Server version/ +--replace_regex /Server ver:.*/Server version/ /xid=[0-9]+/xid=/ show relaylog events in 'mysqld-relay-bin-master1.000002'; @@ -179,7 +185,9 @@ select * from db1.t1; # This should show relay log events for the default master # (the one with the empty name) +--replace_regex /Server ver:.*/Server version/ /xid=[0-9]+/xid=/ show relaylog events; +--replace_regex /Server ver:.*/Server version/ /xid=[0-9]+/xid=/ show relaylog events in 'mysqld-relay-bin.000002'; # Make sure we don't lose control over replication connections diff --git a/mysql-test/suite/multi_source/relaylog_events.test b/mysql-test/suite/multi_source/relaylog_events.test index 67048749f67..ba13a4dd7e9 100644 --- a/mysql-test/suite/multi_source/relaylog_events.test +++ b/mysql-test/suite/multi_source/relaylog_events.test @@ -3,6 +3,8 @@ # for a named master connection # +--source include/not_embedded.inc + --connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3) --replace_result $SERVER_MYPORT_1 MYPORT_1 diff --git a/mysql-test/suite/multi_source/reset_slave.test b/mysql-test/suite/multi_source/reset_slave.test index e63cf1d949a..bcc0560fe5b 100644 --- a/mysql-test/suite/multi_source/reset_slave.test +++ b/mysql-test/suite/multi_source/reset_slave.test @@ -1,4 +1,9 @@ -#--enable_connect_log +# +# Check RESET SLAVE [name] [ALL] for multi-source replication +# + +--source include/not_embedded.inc + --connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3) --replace_result $SERVER_MYPORT_1 MYPORT_1 diff --git a/mysql-test/suite/multi_source/simple.test b/mysql-test/suite/multi_source/simple.test index 8f501b777ad..915cbd73941 100644 --- a/mysql-test/suite/multi_source/simple.test +++ b/mysql-test/suite/multi_source/simple.test @@ -2,6 +2,8 @@ # Simple multi-master test # +--source include/not_embedded.inc + --connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3) --connect (master1,127.0.0.1,root,,,$SERVER_MYPORT_1) --connect (master2,127.0.0.1,root,,,$SERVER_MYPORT_2) diff --git a/mysql-test/suite/multi_source/skip_counter.test b/mysql-test/suite/multi_source/skip_counter.test index 04a9102a312..d158f382a97 100644 --- a/mysql-test/suite/multi_source/skip_counter.test +++ b/mysql-test/suite/multi_source/skip_counter.test @@ -5,6 +5,8 @@ # Create a schema and a table i # on the 1st master +--source include/not_embedded.inc + --connect (master1,127.0.0.1,root,,,$SERVER_MYPORT_1) --disable_warnings diff --git a/mysql-test/suite/multi_source/status_vars.test b/mysql-test/suite/multi_source/status_vars.test index 8ecb9c17074..eec89ee4e81 100644 --- a/mysql-test/suite/multi_source/status_vars.test +++ b/mysql-test/suite/multi_source/status_vars.test @@ -1,3 +1,9 @@ +# +# Status variables related to a replication connection +# + +--source include/not_embedded.inc + --connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3) call mtr.add_suppression("Connection 'master1' already exists"); diff --git a/mysql-test/suite/multi_source/syntax.test b/mysql-test/suite/multi_source/syntax.test index 15e862ab607..ae493200bf1 100644 --- a/mysql-test/suite/multi_source/syntax.test +++ b/mysql-test/suite/multi_source/syntax.test @@ -1,5 +1,7 @@ # Test multi master syntax -source include/master-slave.inc; + +--source include/not_embedded.inc +--source include/master-slave.inc # Check syntax of multi source replication