summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-05 08:19:49 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-05 08:23:23 +0200
commit46fc3bdbca5829115286faa50b331bae0fd47963 (patch)
treec0c31f27a267ff2525e2ce232a9ab8011f19bf17
parent2c7b6214e7653e5b51c691b2be34067af17956e6 (diff)
downloadmariadb-git-46fc3bdbca5829115286faa50b331bae0fd47963.tar.gz
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
-rw-r--r--storage/innobase/buf/buf0buf.cc2
-rw-r--r--storage/innobase/fsp/fsp0file.cc5
2 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 7f98be9e729..e8e9dd37ce1 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -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);
diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc
index 79465906c34..1ad73c83e1c 100644
--- a/storage/innobase/fsp/fsp0file.cc
+++ b/storage/innobase/fsp/fsp0file.cc
@@ -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;