From 46c9268b0a72036a8c8e72762d0b289b38e344bf Mon Sep 17 00:00:00 2001 From: Eugene Kosov Date: Tue, 9 Jul 2019 22:24:50 +0300 Subject: [PATCH] post-merge fixes rebuild galera.galera_as_slave_gtid and multi_source.mdev-8874 --- .../suite/galera/r/galera_as_slave_gtid.result | 3 +++ mysql-test/suite/multi_source/mdev-8874.result | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid.result b/mysql-test/suite/galera/r/galera_as_slave_gtid.result index 12fc6b5ba4d..844d4f3fb7e 100644 --- a/mysql-test/suite/galera/r/galera_as_slave_gtid.result +++ b/mysql-test/suite/galera/r/galera_as_slave_gtid.result @@ -23,6 +23,9 @@ connection node_2; STOP SLAVE; RESET SLAVE ALL; #cleanup +connection node_1; reset master; +connection node_2; reset master; +connection node_3; reset master; diff --git a/mysql-test/suite/multi_source/mdev-8874.result b/mysql-test/suite/multi_source/mdev-8874.result index 25185eed02a..aa9cc39b403 100644 --- a/mysql-test/suite/multi_source/mdev-8874.result +++ b/mysql-test/suite/multi_source/mdev-8874.result @@ -1,21 +1,29 @@ +connect server_1,127.0.0.1,root,,,$SERVER_MYPORT_1; +connect server_2,127.0.0.1,root,,,$SERVER_MYPORT_2; +connect server_3,127.0.0.1,root,,,$SERVER_MYPORT_3; +connect server_4,127.0.0.1,root,,,$SERVER_MYPORT_4; +connection server_1; create database a; use a; create table t1(a int); insert into t1 values(1); create table t2(a int); insert into t2 values(1); +connection server_2; create database b; use b; create table t1(a int); insert into t1 values(1); create table t2(a int); insert into t2 values(1); +connection server_3; create database c; use c; create table t1(a int); insert into t1 values(1); create table t2(a int); insert into t2 values(1); +connection server_4; change master 'm1' to master_port=MYPORT_1 , master_host='127.0.0.1', master_user='root'; change master 'm2' to master_port=MYPORT_2 , master_host='127.0.0.1', master_user='root'; change master to master_port=MYPORT_3 , master_host='127.0.0.1', master_user='root'; @@ -102,9 +110,13 @@ show tables; Tables_in_c t2 #CleanUp +connection server_1; drop database a; +connection server_2; drop database b; +connection server_3; drop database c; +connection server_4; stop all slaves; SET default_master_connection = "m1"; include/wait_for_slave_to_stop.inc