diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-27 13:49:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-28 20:45:45 +0300 |
| commit | a90100d756eb046814f5bba54d522f1574c131ba (patch) | |
| tree | f0ef3db9f7176c01bed9b159af5ac0f44f9f3f97 /storage/innobase/include/dict0dict.ic | |
| parent | ba19764209dc2e2cb0a688cada02e15720d9242b (diff) | |
| download | mariadb-git-a90100d756eb046814f5bba54d522f1574c131ba.tar.gz | |
Replace univ_page_size and UNIV_PAGE_SIZE
Try to use one variable (srv_page_size) for innodb_page_size.
Also, replace UNIV_PAGE_SIZE_SHIFT with srv_page_size_shift.
Diffstat (limited to 'storage/innobase/include/dict0dict.ic')
| -rw-r--r-- | storage/innobase/include/dict0dict.ic | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 2fe12a517b3..84bedcd4dc7 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -595,8 +595,8 @@ dict_tf_is_valid_not_redundant(ulint flags) for the uncompressed page format */ return(false); } else if (zip_ssize > PAGE_ZIP_SSIZE_MAX - || zip_ssize > UNIV_PAGE_SIZE_SHIFT - || UNIV_PAGE_SIZE_SHIFT > UNIV_ZIP_SIZE_SHIFT_MAX) { + || zip_ssize > srv_page_size_shift + || srv_page_size_shift > UNIV_ZIP_SIZE_SHIFT_MAX) { /* KEY_BLOCK_SIZE is out of bounds, or ROW_FORMAT=COMPRESSED is not supported with this innodb_page_size (only up to 16KiB) */ @@ -852,7 +852,7 @@ dict_tf_get_page_size( ut_ad(zip_size <= UNIV_ZIP_SIZE_MAX); - return(page_size_t(zip_size, univ_page_size.logical(), true)); + return(page_size_t(zip_size, srv_page_size, true)); } /*********************************************************************//** @@ -1182,7 +1182,7 @@ ulint dict_index_get_space_reserve(void) /*==============================*/ { - return(UNIV_PAGE_SIZE / 16); + return(srv_page_size / 16); } /********************************************************************//** |