summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-09-22 16:40:47 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-09-24 08:20:44 +0300
commit15efb7ed48265b8d40897a13c0b8e09c6bdd34c9 (patch)
tree026f8cc30efb79fdc1bc198772df6d0adf8bfec1
parent7d360060cb6ea2558820b343ef77d59584b0b805 (diff)
downloadmariadb-git-15efb7ed48265b8d40897a13c0b8e09c6bdd34c9.tar.gz
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.
-rw-r--r--storage/innobase/buf/buf0flu.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
index fb687b4f51b..eada6bde282 100644
--- a/storage/innobase/buf/buf0flu.cc
+++ b/storage/innobase/buf/buf0flu.cc
@@ -2271,7 +2271,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);