diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 11:37:33 +0200 |
| commit | fdf43b5c78c4aeb26efdbef3172746e007ab6f1d (patch) | |
| tree | 7497fd0a024da01b2ade9c45e484a9d004a3f13b /sql/sql_table.cc | |
| parent | 382e85fe70cfffb6c7190c627647c19aed3912a5 (diff) | |
| parent | 8f30973234de520d95dfccca8409e5802b845331 (diff) | |
| download | mariadb-git-fdf43b5c78c4aeb26efdbef3172746e007ab6f1d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 63289e3ba59..c1f7c7fee7a 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6105,6 +6105,10 @@ int mysql_discard_or_import_tablespace(THD *thd, if (unlikely(error)) goto err; + if (discard) + tdc_remove_table(thd, TDC_RT_REMOVE_NOT_OWN, table_list->table->s->db.str, + table_list->table->s->table_name.str, true); + /* The 0 in the call below means 'not in a transaction', which means immediate invalidation; that is probably what we wish here @@ -8409,6 +8413,8 @@ mysql_prepare_alter_table(THD *thd, TABLE *table, } /* if (def->change.str) */ } /* while (def) */ } /* if (part_field_list || subpart_field_list) */ + // Force reopen because new column name is on thd->mem_root + table->mark_table_for_reopen(); } /* if (part_info) */ } #endif |