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

Merge MDEV-8496 into 10.1

Browse Source
This commit is contained in:
Kristian Nielsen 2015-07-19 09:30:36 +02:00
commit 13dbb6fa9e
3 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,6 +381,39 @@ a
50 50
SET GLOBAL slave_exec_mode=@old_slave_mode; SET GLOBAL slave_exec_mode=@old_slave_mode;
SET GLOBAL gtid_strict_mode=@old_strict; SET GLOBAL gtid_strict_mode=@old_strict;
*** MDEV-8496: gtid_ignore_duplicates treats gtid_seq_no as 32-bit ***
SET @old_domain= @@SESSION.gtid_domain_id;
SET SESSION gtid_domain_id=102;
SET SESSION gtid_seq_no=4294967294;
INSERT INTO t1 VALUES (60);
INSERT INTO t1 VALUES (61);
INSERT INTO t1 VALUES (62);
SET SESSION gtid_domain_id= @old_domain;
include/save_master_gtid.inc
include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 60 ORDER BY a;
a
60
61
62
SET default_master_connection = "c2b";
include/sync_with_master_gtid.inc
SET default_master_connection = "a2b";
include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 60 ORDER BY a;
a
60
61
62
SET default_master_connection = "b2c";
include/sync_with_master_gtid.inc
SET default_master_connection = "a2c";
include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 60 ORDER BY a;
a
60
61
62
SET GLOBAL gtid_domain_id=0; SET GLOBAL gtid_domain_id=0;
STOP ALL SLAVES; STOP ALL SLAVES;
Warnings: Warnings:

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

@ -366,6 +366,40 @@ SET GLOBAL slave_exec_mode=@old_slave_mode;
SET GLOBAL gtid_strict_mode=@old_strict; SET GLOBAL gtid_strict_mode=@old_strict;
--echo *** MDEV-8496: gtid_ignore_duplicates treats gtid_seq_no as 32-bit ***
--connection server_1
SET @old_domain= @@SESSION.gtid_domain_id;
SET SESSION gtid_domain_id=102;
SET SESSION gtid_seq_no=4294967294;
INSERT INTO t1 VALUES (60);
INSERT INTO t1 VALUES (61);
INSERT INTO t1 VALUES (62);
# The bug was an overflow, the seq_no value 4294967296 (2**32) was treated
# as 0, causing the last transaction to be ignored.
SET SESSION gtid_domain_id= @old_domain;
--source include/save_master_gtid.inc
--connection server_4
--source include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 60 ORDER BY a;
--connection server_2
SET default_master_connection = "c2b";
--source include/sync_with_master_gtid.inc
SET default_master_connection = "a2b";
--source include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 60 ORDER BY a;
--connection server_3
SET default_master_connection = "b2c";
--source include/sync_with_master_gtid.inc
SET default_master_connection = "a2c";
--source include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 60 ORDER BY a;
# Clean up. # Clean up.
--connection server_1 --connection server_1
SET GLOBAL gtid_domain_id=0; SET GLOBAL gtid_domain_id=0;

2
sql/rpl_gtid.cc
View File

@ -117,7 +117,7 @@ int
rpl_slave_state::check_duplicate_gtid(rpl_gtid *gtid, rpl_group_info *rgi) rpl_slave_state::check_duplicate_gtid(rpl_gtid *gtid, rpl_group_info *rgi)
{ {
uint32 domain_id= gtid->domain_id; uint32 domain_id= gtid->domain_id;
uint32 seq_no= gtid->seq_no; uint64 seq_no= gtid->seq_no;
rpl_slave_state::element *elem; rpl_slave_state::element *elem;
int res; int res;
bool did_enter_cond= false; bool did_enter_cond= false;