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

MDEV-12179: Per-engine mysql.gtid_slave_pos table

Browse Source 
Intermediate commit.

Update multi_source.gtid_ignore_duplicates test to avoid a sporadic
failure following MDEV-12179 functionality.

The test case manually messes with the mysql.gtid_slave_pos table.
Make sure to clean up that at the end of the test, and suppress the
messages from the server about these changes.
This commit is contained in:
Kristian Nielsen 2017-05-11 08:45:29 +02:00
parent b19f055772
commit 95e09f0766
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/multi_source/gtid_ignore_duplicates.result
View File

@ -65,6 +65,7 @@ include/wait_for_slave_to_start.inc
set default_master_connection = ''; set default_master_connection = '';
connection server_1; connection server_1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
CALL mtr.add_suppression("This change will not take full effect until all SQL threads have been restarted");
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
BEGIN; BEGIN;
@ -491,17 +492,21 @@ SET GLOBAL slave_parallel_threads= @old_parallel;
SET GLOBAL gtid_ignore_duplicates= @old_ignore_duplicates; SET GLOBAL gtid_ignore_duplicates= @old_ignore_duplicates;
connection server_1; connection server_1;
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
include/reset_master_slave.inc include/reset_master_slave.inc
disconnect server_1; disconnect server_1;
connection server_2; connection server_2;
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
include/reset_master_slave.inc include/reset_master_slave.inc
disconnect server_2; disconnect server_2;
connection server_3; connection server_3;
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
include/reset_master_slave.inc include/reset_master_slave.inc
disconnect server_3; disconnect server_3;
connection server_4; connection server_4;
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
include/reset_master_slave.inc include/reset_master_slave.inc
disconnect server_4; disconnect server_4;

5
mysql-test/suite/multi_source/gtid_ignore_duplicates.test
View File

@ -86,6 +86,7 @@ set default_master_connection = '';
--connection server_1 --connection server_1
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
CALL mtr.add_suppression("This change will not take full effect until all SQL threads have been restarted");
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
BEGIN; BEGIN;
@ -431,20 +432,24 @@ SET GLOBAL gtid_ignore_duplicates= @old_ignore_duplicates;
--connection server_1 --connection server_1
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
--source include/reset_master_slave.inc --source include/reset_master_slave.inc
--disconnect server_1 --disconnect server_1
--connection server_2 --connection server_2
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
--source include/reset_master_slave.inc --source include/reset_master_slave.inc
--disconnect server_2 --disconnect server_2
--connection server_3 --connection server_3
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
--source include/reset_master_slave.inc --source include/reset_master_slave.inc
--disconnect server_3 --disconnect server_3
--connection server_4 --connection server_4
DROP TABLE t1; DROP TABLE t1;
ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM;
--source include/reset_master_slave.inc --source include/reset_master_slave.inc
--disconnect server_4 --disconnect server_4