Merge branch 'gtid_table_garbage_rows' into 10.1

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
index 94944b5b3e5..955763fe195 100644
--- a/sql/rpl_gtid.cc
+++ b/sql/rpl_gtid.cc
@@ -329,7 +329,9 @@ rpl_slave_state::update(uint32 domain_id, uint32 server_id, uint64 sub_id,
     }
     rgi->gtid_ignore_duplicate_state= rpl_group_info::GTID_DUPLICATE_NULL;
 
+#ifdef HAVE_REPLICATION
     rgi->pending_gtid_deletes_clear();
+#endif
   }
 
   if (!(list_elem= (list_element *)my_malloc(sizeof(*list_elem), MYF(MY_WME))))
@@ -715,12 +717,16 @@ end:
         redundant rows in mysql.gtid_slave_pos may accumulate if transactions
         are rolled back and retried after record_gtid().
       */
+#ifdef HAVE_REPLICATION
       rgi->pending_gtid_deletes_save(gtid->domain_id, elist);
+#endif
     }
     else
     {
       thd->mdl_context.release_transactional_locks();
+#ifdef HAVE_REPLICATION
       rpl_group_info::pending_gtid_deletes_free(elist);
+#endif
     }
   }
   thd->lex->restore_backup_query_tables_list(&lex_backup);