From 669f719cc21286020c95eec11f0d09b74f96639e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 7 Apr 2025 11:01:17 +0300 Subject: [PATCH] MDEV-36489 10.11 crashes during bootstrap on macOS buf_block_t::initialise(): Remove a redundant call to page.lock.init() that was already executed in buf_pool_t::create() or buf_pool_t::resize(). This fixes a regression that was introduced in commit b6923420f326ac030e4f3ef89a2acddb45eccb30 (MDEV-29445). --- .../suite/innodb/t/innodb_buffer_pool_resize_temporary.test | 4 ++-- storage/innobase/buf/buf0buf.cc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_temporary.test b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_temporary.test index 59afed2452159..d997c722eddea 100644 --- a/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_temporary.test +++ b/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_temporary.test @@ -25,8 +25,8 @@ SET DEBUG_SYNC='buf_pool_shrink_before_wakeup SIGNAL blocked WAIT_FOR go'; send SET GLOBAL innodb_buffer_pool_size=8388608; connection default; SET DEBUG_SYNC='now WAIT_FOR blocked'; -# adjust for 32-bit ---replace_result 504/504 505/505 +# adjust for 32-bit and SUX_LOCK_GENERIC +--replace_regex /(5..)\/\1/505\/505/ SHOW STATUS LIKE 'innodb_buffer_pool_resize_status'; SET DEBUG_SYNC='now SIGNAL go'; connection con1; diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 08d037c60e935..f7a9110a7ba03 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -3409,7 +3409,6 @@ void buf_block_t::initialise(const page_id_t page_id, ulint zip_size, { ut_ad(!page.in_file()); buf_block_init_low(this); - page.lock.init(); page.init(fix, page_id); page.set_os_used(); page_zip_set_size(&page.zip, zip_size);