diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2018-10-13 23:48:43 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2018-10-13 23:48:43 +0200 |
| commit | 74387028a06c557f36a0fd1bbde347f1551c8fb7 (patch) | |
| tree | efa9bfe58e300130d50d6e8cf286d6d68b2b96f3 /sql/rpl_gtid.cc | |
| parent | 00164ea4b18b32edb90693c14da125e5307508cf (diff) | |
| parent | 61bba2a540950335c794c69221e92e136c94d060 (diff) | |
| download | mariadb-git-74387028a06c557f36a0fd1bbde347f1551c8fb7.tar.gz | |
Merge branch 'gtid_table_garbage_rows' into 10.3
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 98642769233..fabd09adaa7 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -332,7 +332,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)))) @@ -855,12 +857,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, delete_list); +#endif } else { thd->mdl_context.release_transactional_locks(); +#ifdef HAVE_REPLICATION rpl_group_info::pending_gtid_deletes_free(delete_list); +#endif } } thd->lex->restore_backup_query_tables_list(&lex_backup); |