From 2755e86a53cd89729d0cb54424fe83074dccd8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 22 Sep 2021 16:40:47 +0300 Subject: MDEV-26626 fixup: Do not advance checkpoint during startup While the redo log is being resized in srv_start(), we must not write checkpoint information to the old log. Thanks to Matthias Leich for noticing this. --- storage/innobase/buf/buf0flu.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index f42c66921a3..7bf26515e88 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -2273,7 +2273,9 @@ unemployed: mysql_mutex_unlock(&buf_pool.flush_list_mutex); - if (!recv_recovery_is_on() && srv_operation == SRV_OPERATION_NORMAL) + if (!recv_recovery_is_on() && + !srv_startup_is_before_trx_rollback_phase && + srv_operation == SRV_OPERATION_NORMAL) log_checkpoint(); mysql_mutex_lock(&buf_pool.flush_list_mutex); -- cgit v1.2.1