From 105060e3077a30950bcefb7a05141176bdd25872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Fri, 23 May 2014 08:10:54 +0300 Subject: [PATCH] Fix compiler warnings. --- storage/innobase/btr/btr0cur.cc | 1 - storage/innobase/fil/fil0pagecompress.cc | 2 +- storage/innobase/include/os0file.h | 2 -- storage/xtradb/fil/fil0pagecompress.cc | 4 ++-- storage/xtradb/include/os0file.h | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index 2e61e76d629..8291d6ed804 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -1863,7 +1863,6 @@ btr_cur_update_alloc_zip_func( /* Have a local copy of the variables as these can change dynamically. */ - ulint compression_level = page_zip_level; const page_t* page = page_cur_get_page(cursor); ut_ad(page_zip == page_cur_get_page_zip(cursor)); diff --git a/storage/innobase/fil/fil0pagecompress.cc b/storage/innobase/fil/fil0pagecompress.cc index d96f254e5cc..51f584883b5 100644 --- a/storage/innobase/fil/fil0pagecompress.cc +++ b/storage/innobase/fil/fil0pagecompress.cc @@ -195,7 +195,7 @@ fil_compress_page( ut_ad(fil_page_is_compressed(out_buf)); ut_ad(mach_read_from_4(out_buf+FIL_PAGE_SPACE_OR_CHKSUM) == BUF_NO_CHECKSUM_MAGIC); ut_ad(mach_read_from_2(out_buf+FIL_PAGE_DATA) == write_size); - ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == innodb_compression_algorithm); + ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == (ulint)innodb_compression_algorithm); #endif /* UNIV_DEBUG */ write_size+=header_len; diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index 22a862ce44b..b6c6f50865c 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -733,8 +733,6 @@ pfs_os_file_read_no_error_handling_func( void* buf, /*!< in: buffer where to read */ os_offset_t offset, /*!< in: file offset where to read */ ulint n, /*!< in: number of bytes to read */ - ulint atomic_writes,/*!< in: atomic writes table option - value */ const char* src_file,/*!< in: file name where func invoked */ ulint src_line);/*!< in: line where the func invoked */ diff --git a/storage/xtradb/fil/fil0pagecompress.cc b/storage/xtradb/fil/fil0pagecompress.cc index ce7063bc688..51f584883b5 100644 --- a/storage/xtradb/fil/fil0pagecompress.cc +++ b/storage/xtradb/fil/fil0pagecompress.cc @@ -195,7 +195,7 @@ fil_compress_page( ut_ad(fil_page_is_compressed(out_buf)); ut_ad(mach_read_from_4(out_buf+FIL_PAGE_SPACE_OR_CHKSUM) == BUF_NO_CHECKSUM_MAGIC); ut_ad(mach_read_from_2(out_buf+FIL_PAGE_DATA) == write_size); - ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == innodb_compression_algorithm); + ut_ad(mach_read_from_8(out_buf+FIL_PAGE_FILE_FLUSH_LSN) == (ulint)innodb_compression_algorithm); #endif /* UNIV_DEBUG */ write_size+=header_len; @@ -342,7 +342,7 @@ fil_decompress_page( if (err != LZO_E_OK || (olen == 0 || olen > UNIV_PAGE_SIZE)) { fprintf(stderr, "InnoDB: Corruption: Page is marked as compressed\n" - "InnoDB: but decompression read only %d bytes.\n" + "InnoDB: but decompression read only %ld bytes.\n" "InnoDB: size %lu len %lu\n", olen, actual_size, len); fflush(stderr); diff --git a/storage/xtradb/include/os0file.h b/storage/xtradb/include/os0file.h index 4424184af6a..3d3d9a0f74f 100644 --- a/storage/xtradb/include/os0file.h +++ b/storage/xtradb/include/os0file.h @@ -742,8 +742,6 @@ pfs_os_file_read_func( os_offset_t offset, /*!< in: file offset where to read */ ulint n, /*!< in: number of bytes to read */ trx_t* trx, - ulint atomic_writes,/*!< in: atomic writes table option - value */ const char* src_file,/*!< in: file name where func invoked */ ulint src_line);/*!< in: line where the func invoked */