MDEV-18543 fixup: Fix 32-bit builds

Author: dr-m

storage/innobase/include/page0page.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 Copyright (c) 1994, 2019, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2013, 2020, MariaDB Corporation.
+Copyright (c) 2013, 2021, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -570,7 +570,7 @@ page_get_middle_rec(
 Gets the page number.
 @return page number */
 UNIV_INLINE
-ulint
+uint32_t
 page_get_page_no(
 /*=============*/
 	const page_t*	page);	/*!< in: page */
@@ -579,7 +579,7 @@ page_get_page_no(
 Gets the tablespace identifier.
 @return space id */
 UNIV_INLINE
-ulint
+uint32_t
 page_get_space_id(
 /*==============*/
 	const page_t*	page);	/*!< in: page */

storage/innobase/include/page0page.ic

@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1994, 2019, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2020, MariaDB Corporation.
+Copyright (c) 2016, 2021, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -421,7 +421,7 @@ page_get_middle_rec(
 Gets the page number.
 @return page number */
 UNIV_INLINE
-ulint
+uint32_t
 page_get_page_no(
 /*=============*/
 	const page_t*	page)	/*!< in: page */
@@ -435,7 +435,7 @@ page_get_page_no(
 Gets the tablespace identifier.
 @return space id */
 UNIV_INLINE
-ulint
+uint32_t
 page_get_space_id(
 /*==============*/
 	const page_t*	page)	/*!< in: page */

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]() {