summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-08-22 12:36:42 +0200
committerunknown <knielsen@knielsen-hq.org>2013-08-22 12:36:42 +0200
commitf74c745a994cbbf3b8289674bf49629224457d4e (patch)
treed1cd1df1a0bf6004428683af6dd83cc7b5b55937 /sql/rpl_rli.h
parent33c66eb7fbcddb09217820708e8ce9324e65db11 (diff)
downloadmariadb-git-f74c745a994cbbf3b8289674bf49629224457d4e.tar.gz
MDEV-4488: When master is on the list of ignore_server_ids, GTID position on slave is not updated
The ignored events are not written to the relay log, but instead a fake Rotate event is generated to handle update of position. Extend this for Gtid so we similarly generate a fake Gtid_list event to update the GTID position. Also fix an unrelated test issue that got triggered by the added test cases.
Diffstat (limited to 'sql/rpl_rli.h')
-rw-r--r--sql/rpl_rli.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index 6dd757343fd..9ab5dcb30a5 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -303,6 +303,8 @@ public:
*/
char ign_master_log_name_end[FN_REFLEN];
ulonglong ign_master_log_pos_end;
+ /* Similar for ignored GTID events. */
+ slave_connection_state ign_gtids;
/*
Indentifies where the SQL Thread should create temporary files for the