Merge MDEV-4506: Parallel replication into 10.0-base.

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/rpl_gtid.h b/sql/rpl_gtid.h
index d6da2295abe..a503184cee6 100644
--- a/sql/rpl_gtid.h
+++ b/sql/rpl_gtid.h
@@ -60,7 +60,6 @@ struct rpl_slave_state
   struct element
   {
     struct list_element *list;
-    uint64 last_sub_id;
     uint32 domain_id;
 
     list_element *grab_list() { list_element *l= list; list= NULL; return l; }
@@ -68,8 +67,6 @@ struct rpl_slave_state
     {
       l->next= list;
       list= l;
-      if (last_sub_id < l->sub_id)
-        last_sub_id= l->sub_id;
     }
   };
 
@@ -78,6 +75,7 @@ struct rpl_slave_state
   /* Mutex protecting access to the state. */
   mysql_mutex_t LOCK_slave_state;
 
+  uint64 last_sub_id;
   bool inited;
   bool loaded;
 
@@ -108,7 +106,7 @@ struct rpl_slave_state
   int put_back_list(uint32 domain_id, list_element *list);
 
   void update_state_hash(uint64 sub_id, rpl_gtid *gtid);
-  int record_and_update_gtid(THD *thd, Relay_log_info *rli);
+  int record_and_update_gtid(THD *thd, struct rpl_group_info *rgi);
 };