summaryrefslogtreecommitdiff
path: root/storage/innobase/row
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 13:28:16 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 13:28:16 +0300
commit772d6d347dd096c5959cb2b68a4e95ca62cf6cc0 (patch)
tree340b5b9450d72f6abf6917e0f9b087c42acd9b1a /storage/innobase/row
parent05a0eae335ebdd1f9ac7540c263b870a17d69b9f (diff)
downloadmariadb-git-772d6d347dd096c5959cb2b68a4e95ca62cf6cc0.tar.gz
MDEV-18543 fixup: Fix 32-bit builds
Diffstat (limited to 'storage/innobase/row')
-rw-r--r--storage/innobase/row/row0import.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index aaa3b381b23..d2236d1e400 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -3229,10 +3229,10 @@ static dberr_t handle_instant_metadata(dict_table_t *table,
return err;
}
- const auto zip_size= fil_space_t::zip_size(space_flags);
- const uint64_t physical_size= zip_size ? zip_size : srv_page_size;
+ const unsigned zip_size= fil_space_t::zip_size(space_flags);
+ const unsigned physical_size= zip_size ? zip_size : unsigned(srv_page_size);
ut_ad(physical_size <= UNIV_PAGE_SIZE_MAX);
- const auto space_id= page_get_space_id(first_page.get());
+ const uint32_t space_id= page_get_space_id(first_page.get());
auto *space_crypt= fil_space_read_crypt_data(zip_size, first_page.get());
SCOPE_EXIT([&space_crypt]() {