1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-21225: Fix warnings

Browse Source 
Datafile::find_space_id(): Remove an unused variable

buf_chunk_init(): warning C4319:  '~': zero extending 'ulong' to 'ulint'
of greater size
This commit is contained in:
Marko Mäkelä 2019-12-05 08:19:49 +02:00
parent 2c7b6214e7
commit 46fc3bdbca
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/buf/buf0buf.cc
View File

@ -1605,7 +1605,7 @@ buf_chunk_init(
frame = reinterpret_cast<byte*>((reinterpret_cast<ulint>(chunk->mem)
+ srv_page_size - 1)
& ~(srv_page_size - 1));
& ~ulint{srv_page_size - 1});
chunk->size = (chunk->mem_pfx.m_size >> srv_page_size_shift)
- (frame != chunk->mem);

5
storage/innobase/fsp/fsp0file.cc
View File

@ -673,9 +673,8 @@ Datafile::find_space_id()
}
for (ulint j = 0; j < page_count; ++j) {
if (dberr_t err = os_file_read(
IORequestRead, m_handle, page,
j * page_size, page_size)) {
if (os_file_read(IORequestRead, m_handle, page,
j * page_size, page_size)) {
ib::info()
<< "READ FAIL: page_no:" << j;
continue;