diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 13:09:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 13:09:51 +0300 |
| commit | e5e83daf32300115d857b49fdbd35460bbf51d52 (patch) | |
| tree | 6c4ecbad6980c7c2e44fa3d3607c64929f23c93a | |
| parent | 2af8f712de3a9d518a70904e65ff8cf18beb5f1d (diff) | |
| download | mariadb-git-e5e83daf32300115d857b49fdbd35460bbf51d52.tar.gz | |
Make DISCARD TABLESPACE more robust
dict_load_table_low(): Copy the 'discarded' flag to file_unreadable.
This allows to avoid a potentially harmful call to dict_stats_init()
in ha_innobase::open().
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index af14c6a4770..22fc70a4e42 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -2686,7 +2686,7 @@ static const char* dict_load_table_low(const table_name_t& name, *table = dict_mem_table_create( name.m_name, space_id, n_cols + n_v_col, n_v_col, flags, flags2); (*table)->id = table_id; - (*table)->file_unreadable = false; + (*table)->file_unreadable = !!(flags2 & DICT_TF2_DISCARDED); return(NULL); } |