summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-09-11 21:31:47 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-09-11 21:31:47 +0300
commit67fa97dc2c44f974bb26bba8a0efa3bb409e6bc5 (patch)
tree5bbb79933755b9c8b8ea79af304e7d196f64e809 /sql
parent1bf3e8ab43e982953d7534db902020d321364afb (diff)
parent6b61f1bbad1a57509d1cd0c09e80e31fffcfc67d (diff)
downloadmariadb-git-67fa97dc2c44f974bb26bba8a0efa3bb409e6bc5.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql')
-rw-r--r--sql/rpl_gtid.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
index ad885c925d9..4752eac283f 100644
--- a/sql/rpl_gtid.cc
+++ b/sql/rpl_gtid.cc
@@ -403,6 +403,8 @@ rpl_slave_state::truncate_state_table(THD *thd)
tlist.init_one_table(&MYSQL_SCHEMA_NAME, &rpl_gtid_slave_state_table_name, NULL, TL_WRITE);
if (!(err= open_and_lock_tables(thd, &tlist, FALSE, 0)))
{
+ tdc_remove_table(thd, TDC_RT_REMOVE_UNUSED, "mysql",
+ rpl_gtid_slave_state_table_name.str, false);
err= tlist.table->file->ha_truncate();
if (err)