diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-05 14:35:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-05 14:55:56 +0300 |
| commit | e555540ab6b9c3e0d4fdd00af093b115a9401d0a (patch) | |
| tree | 84467ec02335ca26faeaffd416bfc552faea6b22 /storage/innobase/include/dict0dict.ic | |
| parent | 8ae9c86f2a79f1301f5428542fc7f53feed7d4f4 (diff) | |
| download | mariadb-git-e555540ab6b9c3e0d4fdd00af093b115a9401d0a.tar.gz | |
MDEV-13105 InnoDB fails to load a table with PAGE_COMPRESSION_LEVEL after upgrade from 10.1.20
When using innodb_page_size=16k, InnoDB tables
that were created in MariaDB 10.1.0 to 10.1.20 with
PAGE_COMPRESSED=1 and
PAGE_COMPRESSION_LEVEL=2 or PAGE_COMPRESSION_LEVEL=3
would fail to load.
fsp_flags_is_valid(): When using innodb_page_size=16k, use a
more strict check for .ibd files, with the assumption that
nobody would try to use different-page-size files.
Diffstat (limited to 'storage/innobase/include/dict0dict.ic')
| -rw-r--r-- | storage/innobase/include/dict0dict.ic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 6044f992d82..147968a343a 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -934,7 +934,7 @@ dict_tf_to_fsp_flags( fsp_flags |= FSP_FLAGS_MASK_PAGE_COMPRESSION; } - ut_a(fsp_flags_is_valid(fsp_flags)); + ut_a(fsp_flags_is_valid(fsp_flags, false)); if (DICT_TF_HAS_DATA_DIR(table_flags)) { fsp_flags |= 1U << FSP_FLAGS_MEM_DATA_DIR; |