Commit 46fc3bdb authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-21225: Fix warnings

Datafile::find_space_id(): Remove an unused variable

buf_chunk_init(): warning C4319:  '~': zero extending 'ulong' to 'ulint'
of greater size
parent 2c7b6214
...@@ -1605,7 +1605,7 @@ buf_chunk_init( ...@@ -1605,7 +1605,7 @@ buf_chunk_init(
frame = reinterpret_cast<byte*>((reinterpret_cast<ulint>(chunk->mem) frame = reinterpret_cast<byte*>((reinterpret_cast<ulint>(chunk->mem)
+ srv_page_size - 1) + srv_page_size - 1)
& ~(srv_page_size - 1)); & ~ulint{srv_page_size - 1});
chunk->size = (chunk->mem_pfx.m_size >> srv_page_size_shift) chunk->size = (chunk->mem_pfx.m_size >> srv_page_size_shift)
- (frame != chunk->mem); - (frame != chunk->mem);
......
...@@ -673,9 +673,8 @@ Datafile::find_space_id() ...@@ -673,9 +673,8 @@ Datafile::find_space_id()
} }
for (ulint j = 0; j < page_count; ++j) { for (ulint j = 0; j < page_count; ++j) {
if (dberr_t err = os_file_read( if (os_file_read(IORequestRead, m_handle, page,
IORequestRead, m_handle, page, j * page_size, page_size)) {
j * page_size, page_size)) {
ib::info() ib::info()
<< "READ FAIL: page_no:" << j; << "READ FAIL: page_no:" << j;
continue; continue;
......
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