Commit b1317c17 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-31628: InnoDB reports the wrong system tablespace size on bootstrap

SysTablespace::set_size(): Use correct 64-bit arithmetics for
reporting the initial size of the InnoDB system or temporary tablespace.
parent 35de8326
...@@ -393,11 +393,11 @@ SysTablespace::set_size( ...@@ -393,11 +393,11 @@ SysTablespace::set_size(
Datafile& file) Datafile& file)
{ {
ut_ad(!srv_read_only_mode || m_ignore_read_only); ut_ad(!srv_read_only_mode || m_ignore_read_only);
const ib::bytes_iec b{uint64_t{file.m_size} << srv_page_size_shift};
/* We created the data file and now write it full of zeros */ /* We created the data file and now write it full of zeros */
ib::info() << "Setting file '" << file.filepath() << "' size to " ib::info() << "Setting file '" << file.filepath() << "' size to " << b
<< ib::bytes_iec{file.m_size << srv_page_size_shift} << << ". Physically writing the file full; Please wait ...";
". Physically writing the file full; Please wait ...";
bool success = os_file_set_size( bool success = os_file_set_size(
file.m_filepath, file.m_handle, file.m_filepath, file.m_handle,
...@@ -405,7 +405,7 @@ SysTablespace::set_size( ...@@ -405,7 +405,7 @@ SysTablespace::set_size(
if (success) { if (success) {
ib::info() << "File '" << file.filepath() << "' size is now " ib::info() << "File '" << file.filepath() << "' size is now "
<< ib::bytes_iec{file.m_size << srv_page_size_shift} << b
<< "."; << ".";
} else { } else {
ib::error() << "Could not set the file size of '" ib::error() << "Could not set the file size of '"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment