diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2019-06-19 17:42:37 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-11-25 18:49:51 +0400 |
| commit | 092834cd2cd90c73623c019eb030f25740843e81 (patch) | |
| tree | 4ae53b062ece0b56097e5926b70ee8249bcd9945 /sql/sql_table.cc | |
| parent | 0aa807d10051e1231bf3d4457db16ad8e66111aa (diff) | |
| download | mariadb-git-092834cd2cd90c73623c019eb030f25740843e81.tar.gz | |
Removed kill_delayed_threads_for_table()
After 7fb9d64 it is used only by ALTER/DROP SERVER, which most probably
wasn't intentional as Federated never supported delayed inserts anyway.
If delayed inserts will ever become an issue with ALTER/DROP SERVER, we
should kill them by acquiring X-lock instead.
Part of MDEV-17882 - Cleanup refresh version
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b484d9502d5..440cc0dfba7 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2470,8 +2470,8 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists, table->table= 0; } else - tdc_remove_table(thd, TDC_RT_REMOVE_ALL, table->db.str, table->table_name.str, - false); + tdc_remove_table(thd, TDC_RT_REMOVE_ALL, table->db.str, + table->table_name.str); /* Check that we have an exclusive lock on the table to be dropped. */ DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::TABLE, table->db.str, @@ -7626,8 +7626,7 @@ static bool mysql_inplace_alter_table(THD *thd, goto cleanup; tdc_remove_table(thd, TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE, - table->s->db.str, table->s->table_name.str, - false); + table->s->db.str, table->s->table_name.str); } /* @@ -7821,7 +7820,7 @@ static bool mysql_inplace_alter_table(THD *thd, { // Remove TABLE and TABLE_SHARE for old name from TDC. tdc_remove_table(thd, TDC_RT_REMOVE_ALL, - alter_ctx->db.str, alter_ctx->table_name.str, false); + alter_ctx->db.str, alter_ctx->table_name.str); if (mysql_rename_table(db_type, &alter_ctx->db, &alter_ctx->table_name, &alter_ctx->new_db, &alter_ctx->new_alias, 0)) |