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

Fix race in test case.

Browse Source
This commit is contained in:
unknown 2013-04-18 11:17:10 +02:00
parent e46341758d
commit 71c211d48b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/multi_source/gtid.result
View File

@ -14,9 +14,9 @@ Note 1937 SLAVE '' started
include/wait_for_slave_to_start.inc
SET GLOBAL gtid_domain_id= 1;
SET SESSION gtid_domain_id= 1;
CREATE TABLE t3 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB;
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10));
INSERT INTO t1 VALUES (1, "initial");
CREATE TABLE t3 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB;
INSERT INTO t3 VALUES (101, "initial 1");
SET GLOBAL gtid_domain_id= 2;
SET SESSION gtid_domain_id= 2;

8
mysql-test/suite/multi_source/gtid.test
View File

@ -32,11 +32,17 @@ start all slaves;
--connection master1
SET GLOBAL gtid_domain_id= 1;
SET SESSION gtid_domain_id= 1;
CREATE TABLE t3 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB;
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10));
INSERT INTO t1 VALUES (1, "initial");
CREATE TABLE t3 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB;
INSERT INTO t3 VALUES (101, "initial 1");
# Make sure we have CREATE TABLE t3 from master1 before replicating INSERT INTO
# t3 from master2.
--connection slave1
--let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.tables WHERE table_name = "t3" AND table_schema = "test"
--source include/wait_condition.inc
--connection master2
SET GLOBAL gtid_domain_id= 2;
SET SESSION gtid_domain_id= 2;