From a0fda162ebd991a60634103f2c9d0735154b9dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 21 Oct 2021 15:31:21 +0300 Subject: [PATCH] Fix GCC 11.2.0 -m32 (IA-32) warnings page_create_low(): Fix -Warray-bounds log_buffer_extend(): Fix -Wstringop-overflow --- storage/innobase/log/log0log.cc | 2 -- storage/innobase/page/page0page.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 257645cb6a4..f677aedc87c 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -79,10 +79,8 @@ void log_buffer_extend(ulong len) const size_t new_buf_size = ut_calc_align(len, srv_page_size); byte* new_buf = static_cast (ut_malloc_dontdump(new_buf_size, PSI_INSTRUMENT_ME)); - TRASH_ALLOC(new_buf, new_buf_size); byte* new_flush_buf = static_cast (ut_malloc_dontdump(new_buf_size, PSI_INSTRUMENT_ME)); - TRASH_ALLOC(new_flush_buf, new_buf_size); mysql_mutex_lock(&log_sys.mutex); diff --git a/storage/innobase/page/page0page.cc b/storage/innobase/page/page0page.cc index 9b83470e65c..1b8b3cb339f 100644 --- a/storage/innobase/page/page0page.cc +++ b/storage/innobase/page/page0page.cc @@ -283,7 +283,7 @@ void page_create_low(const buf_block_t* block, bool comp) compile_time_assert(PAGE_BTR_IBUF_FREE_LIST_NODE + FLST_NODE_SIZE <= PAGE_DATA); - page = buf_block_get_frame(block); + page = block->frame; fil_page_set_type(page, FIL_PAGE_INDEX);