MDEV-26: Global Transaction ID.

Fix things so that GTID state on slave is updated also for
non-XID event groups (ie. DDL and MyISAM DML).

1 files changed, 17 insertions, 0 deletions

diff --git a/sql/slave.cc b/sql/slave.cc
index 33455986008..3c98ecf3639 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -5151,8 +5151,25 @@ MYSQL *rpl_connect_master(MYSQL *mysql)
 bool flush_relay_log_info(Relay_log_info* rli)
 {
   bool error=0;
+  uint64 sub_id;
+  rpl_gtid gtid;
   DBUG_ENTER("flush_relay_log_info");
 
+  /*
+    Update the GTID position, if we have it and did not already update
+    it in a GTID transaction.
+  */
+  if ((sub_id= rli->gtid_sub_id))
+  {
+    rli->gtid_sub_id= 0;
+    gtid= rli->current_gtid;
+    if (rpl_global_gtid_slave_state.record_gtid(rli->sql_thd,
+                                                &gtid, sub_id, false))
+      error= 1;
+    else
+      update_slave_gtid_state_hash(sub_id, &gtid);
+  }
+
   if (unlikely(rli->no_storage))
     DBUG_RETURN(0);