diff options
Diffstat (limited to 'storage/innobase/dict/dict0crea.cc')
| -rw-r--r-- | storage/innobase/dict/dict0crea.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index 9d5daef6332..5bb222389ef 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -407,11 +407,11 @@ dict_build_table_def_step( bool has_data_dir = DICT_TF_HAS_DATA_DIR(table->flags); ulint fsp_flags = dict_tf_to_fsp_flags(table->flags); ut_ad(!has_data_dir || table->data_dir_path); - char* filepath = has_data_dir - ? fil_make_filepath(table->data_dir_path, - table->name.m_name, IBD, true) - : fil_make_filepath(NULL, - table->name.m_name, IBD, false); + char* filepath = fil_make_filepath(has_data_dir + ? table->data_dir_path + : nullptr, + table->name, IBD, + has_data_dir); /* We create a new single-table tablespace for the table. We initially let it be 4 pages: @@ -423,7 +423,7 @@ dict_build_table_def_step( dberr_t err; table->space = fil_ibd_create( - space_id, table->name.m_name, filepath, fsp_flags, + space_id, table->name, filepath, fsp_flags, FIL_IBD_FILE_INITIAL_SIZE, node->mode, node->key_id, &err); |