From a8656d58d40ec4e0e857f12b9f99b35786c381ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 22 Feb 2018 09:49:50 +0200 Subject: [PATCH] Fix the startup with innodb_force_recovery=5 At innodb_force_recovery=5 or bigger, trx_lists_init_at_db_start() no longer initialises the purge_sys. Adjust an assertion accordingly. --- storage/innobase/srv/srv0start.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index c8a574b1b30..f87a6303895 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2583,7 +2583,8 @@ files_checked: srv_start_state |= SRV_START_STATE_LOCK_SYS | SRV_START_STATE_MONITOR; - ut_a(trx_purge_state() == PURGE_STATE_INIT); + ut_ad(srv_force_recovery >= SRV_FORCE_NO_UNDO_LOG_SCAN + || trx_purge_state() == PURGE_STATE_INIT); if (srv_force_recovery < SRV_FORCE_NO_BACKGROUND) { srv_undo_sources = true;