mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bling windows build fix

Browse source
This commit is contained in:
Eugene Kosov 2020-01-04 00:23:26 +07:00
parent ccd87d34a4
commit d9789718b9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
storage/innobase/log/log0log.cc
View file

@ -615,8 +615,8 @@ void log_t::files::read(size_t total_offset, span<byte> buf)
{
ut_ad(files.size() == file_names.size());
const size_t file_idx= total_offset / file_size;
const size_t offset= total_offset % file_size;
const size_t file_idx= total_offset / static_cast<size_t>(file_size);
const size_t offset= total_offset % static_cast<size_t>(file_size);
if (const dberr_t err= os_file_read(IORequestRead, files[file_idx],
buf.data(), offset, buf.size()))
@ -630,8 +630,8 @@ void log_t::files::write(size_t total_offset, span<byte> buf)
{
ut_ad(files.size() == file_names.size());
const size_t file_idx= total_offset / file_size;
const size_t offset= total_offset % file_size;
const size_t file_idx= total_offset / static_cast<size_t>(file_size);
const size_t offset= total_offset % static_cast<size_t>(file_size);
if (const dberr_t err=
os_file_write(IORequestWrite, file_names[file_idx].c_str(),
@ -735,7 +735,7 @@ log_file_header_flush(
srv_stats.os_log_pending_writes.inc();
log_sys.log.write(dest_offset, buf);
log_sys.log.write(static_cast<size_t>(dest_offset), buf);
srv_stats.os_log_pending_writes.dec();
}
@ -836,7 +836,7 @@ loop:
ut_a((next_offset >> srv_page_size_shift) <= ULINT_MAX);
log_sys.log.write(next_offset, {buf, write_len});
log_sys.log.write(static_cast<size_t>(next_offset), {buf, write_len});
srv_stats.os_log_pending_writes.dec();

2
storage/innobase/log/log0recv.cc
View file

@ -899,7 +899,7 @@ loop:
ut_a((source_offset >> srv_page_size_shift) <= ULINT_MAX);
log_sys.log.read(source_offset, {buf, len});
log_sys.log.read(static_cast<size_t>(source_offset), {buf, len});
for (ulint l = 0; l < len; l += OS_FILE_LOG_BLOCK_SIZE,
buf += OS_FILE_LOG_BLOCK_SIZE,