summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-15 16:28:19 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-15 17:06:17 +0300
commit9028cc6b865222cae8c396b4ec3e317c8ee068d1 (patch)
tree2aecbbca53dda9b58c605bb371908fa82bc8057f /extra
parent61161d51d724a7fc7f99af56b7c00dd7e86c023f (diff)
downloadmariadb-git-9028cc6b865222cae8c396b4ec3e317c8ee068d1.tar.gz
Cleanup: Make InnoDB page numbers uint32_t
InnoDB stores a 32-bit page number in page headers and in some data structures, such as FIL_ADDR (consisting of a 32-bit page number and a 16-bit byte offset within a page). For better compile-time error detection and to reduce the memory footprint in some data structures, let us use a uint32_t for the page number, instead of ulint (size_t) which can be 64 bits.
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 3da6239b6f8..1d98f89894a 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -3099,7 +3099,7 @@ xb_load_single_table_tablespace(
ut_a(space != NULL);
- space->add(file->filepath(), OS_FILE_CLOSED, ulint(n_pages),
+ space->add(file->filepath(), OS_FILE_CLOSED, uint32_t(n_pages),
false, false);
/* by opening the tablespace we forcing node and space objects
in the cache to be populated with fields from space header */
@@ -4901,7 +4901,7 @@ xtrabackup_apply_delta(
space->chain);
bool fail = !strcmp(n->name, dst_path)
&& !fil_space_extend(
- space, (ulint)n_pages);
+ space, uint32_t(n_pages));
if (fail) goto error;
}
}