diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-26 22:58:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-26 22:58:41 +0300 |
| commit | 99fa7c6c2f9c8d705481bec35f7c4af48848cf70 (patch) | |
| tree | 1a479bdeaef6e4f2e874ce0274d9f577b5b828ce /storage/innobase/include/dict0dict.ic | |
| parent | 2898c7ec9e5c76a6c6bba41c9d3f5a738cf2790a (diff) | |
| parent | b4c5e4a717e3ce2c2d434106cc74417fe9a1d3dc (diff) | |
| download | mariadb-git-99fa7c6c2f9c8d705481bec35f7c4af48848cf70.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/dict0dict.ic')
| -rw-r--r-- | storage/innobase/include/dict0dict.ic | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 01710a0e93a..b0e78e77f2c 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -1450,16 +1450,8 @@ bool dict_table_is_file_per_table( const dict_table_t* table) /*!< in: table to check */ { - bool is_file_per_table = table->space != fil_system.sys_space + return table->space != fil_system.sys_space && table->space != fil_system.temp_space; - - /* If the table is file-per-table and it is not redundant, then - it should have the flags2 bit for DICT_TF2_USE_FILE_PER_TABLE. */ - ut_ad(!is_file_per_table - || !DICT_TF_GET_COMPACT(table->flags) - || DICT_TF2_FLAG_IS_SET(table, DICT_TF2_USE_FILE_PER_TABLE)); - - return(is_file_per_table); } /** Get reference count. |