1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

post-merge fixes

Browse Source 
rebuild galera.galera_as_slave_gtid and multi_source.mdev-8874
This commit is contained in:
Eugene Kosov 2019-07-09 22:24:50 +03:00
parent 4f1e4aa2ca
commit 46c9268b0a
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/galera/r/galera_as_slave_gtid.result
View File

@ -23,6 +23,9 @@ connection node_2;
STOP SLAVE; STOP SLAVE;
RESET SLAVE ALL; RESET SLAVE ALL;
#cleanup #cleanup
connection node_1;
reset master; reset master;
connection node_2;
reset master; reset master;
connection node_3;
reset master; reset master;

12
mysql-test/suite/multi_source/mdev-8874.result
View File

@ -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; create database a;
use a; use a;
create table t1(a int); create table t1(a int);
insert into t1 values(1); insert into t1 values(1);
create table t2(a int); create table t2(a int);
insert into t2 values(1); insert into t2 values(1);
connection server_2;
create database b; create database b;
use b; use b;
create table t1(a int); create table t1(a int);
insert into t1 values(1); insert into t1 values(1);
create table t2(a int); create table t2(a int);
insert into t2 values(1); insert into t2 values(1);
connection server_3;
create database c; create database c;
use c; use c;
create table t1(a int); create table t1(a int);
insert into t1 values(1); insert into t1 values(1);
create table t2(a int); create table t2(a int);
insert into t2 values(1); 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 '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 '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'; 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 Tables_in_c
t2 t2
#CleanUp #CleanUp
connection server_1;
drop database a; drop database a;
connection server_2;
drop database b; drop database b;
connection server_3;
drop database c; drop database c;
connection server_4;
stop all slaves; stop all slaves;
SET default_master_connection = "m1"; SET default_master_connection = "m1";
include/wait_for_slave_to_stop.inc include/wait_for_slave_to_stop.inc