Merge branch 'gtid_table_garbage_rows' into gtid_table_garbage_rows_10.3

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index b8b153c34be..d9f0e0e5d3b 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -757,6 +757,11 @@ struct rpl_group_info
   /* Needs room for "Gtid D-S-N\x00". */
   char gtid_info_buf[5+10+1+10+1+20+1];
 
+  /* List of not yet committed deletions in mysql.gtid_slave_pos. */
+  rpl_slave_state::list_element *pending_gtid_delete_list;
+  /* Domain associated with pending_gtid_delete_list. */
+  uint32 pending_gtid_delete_list_domain;
+
   /*
     The timestamp, from the master, of the commit event.
     Used to do delayed update of rli->last_master_timestamp, for getting
@@ -898,6 +903,12 @@ struct rpl_group_info
   char *gtid_info();
   void unmark_start_commit();
 
+  static void pending_gtid_deletes_free(rpl_slave_state::list_element *list);
+  void pending_gtid_deletes_save(uint32 domain_id,
+                                 rpl_slave_state::list_element *list);
+  void pending_gtid_deletes_put_back();
+  void pending_gtid_deletes_clear();
+
   longlong get_row_stmt_start_timestamp()
   {
     return row_stmt_start_timestamp;