diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 21:58:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 21:58:35 +0200 |
| commit | f6e16bdc62d80a1b26a955aafb1b60fafa912beb (patch) | |
| tree | bb2d6126379b0e0518d0064b584b8677d3df8582 /storage/innobase/include/dict0dict.ic | |
| parent | 839cf16bb2de078d5000bcb2f9b3151f1ebda708 (diff) | |
| parent | e3dda3d95ee4c09c2ed45ce886ecd25d1fc1ae92 (diff) | |
| download | mariadb-git-f6e16bdc62d80a1b26a955aafb1b60fafa912beb.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/dict0dict.ic')
| -rw-r--r-- | storage/innobase/include/dict0dict.ic | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 03b842e041d..78e16774a09 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -685,31 +685,30 @@ dict_tf_set( bool page_compressed, ulint page_compression_level) { + *flags = use_data_dir ? 1 << DICT_TF_POS_DATA_DIR : 0; + switch (format) { case REC_FORMAT_REDUNDANT: - *flags = 0; ut_ad(zip_ssize == 0); - break; + /* no other options are allowed */ + ut_ad(!page_compressed); + return; case REC_FORMAT_COMPACT: - *flags = DICT_TF_COMPACT; + *flags |= DICT_TF_COMPACT; ut_ad(zip_ssize == 0); break; case REC_FORMAT_COMPRESSED: - *flags = DICT_TF_COMPACT + *flags |= DICT_TF_COMPACT | (1 << DICT_TF_POS_ATOMIC_BLOBS) | (zip_ssize << DICT_TF_POS_ZIP_SSIZE); break; case REC_FORMAT_DYNAMIC: - *flags = DICT_TF_COMPACT + *flags |= DICT_TF_COMPACT | (1 << DICT_TF_POS_ATOMIC_BLOBS); ut_ad(zip_ssize == 0); break; } - if (use_data_dir) { - *flags |= (1 << DICT_TF_POS_DATA_DIR); - } - if (page_compressed) { *flags |= (1 << DICT_TF_POS_ATOMIC_BLOBS) | (1 << DICT_TF_POS_PAGE_COMPRESSION) |