diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 16:40:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 16:40:47 +0300 |
| commit | 2755e86a53cd89729d0cb54424fe83074dccd8ab (patch) | |
| tree | 40d4fc4307461eaef0448cfc78a24f74e5c957ec | |
| parent | 7b9a282430e9e2ffcc2b49b4b6d902d15e5ffb30 (diff) | |
| download | mariadb-git-bb-10.5-MDEV-26450.tar.gz | |
MDEV-26626 fixup: Do not advance checkpoint during startupbb-10.5-MDEV-26450
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.
| -rw-r--r-- | storage/innobase/buf/buf0flu.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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); |