diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2021-02-23 13:55:39 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2021-02-23 13:56:40 +0530 |
| commit | 787c47586e809c512d5e6dbd2b66645294ad0adc (patch) | |
| tree | 165f6fcae3cc71b211ae529b6597f56eea7090ce | |
| parent | 3c021485c913828b83510967c1ff277011a9d59a (diff) | |
| download | mariadb-git-787c47586e809c512d5e6dbd2b66645294ad0adc.tar.gz | |
MDEV-24913 Assertion !recv_no_log_write in log_write_up_to()
- The commit 5fd3c7471e3e0673b50d309567c9747d36f09412(MDEV-24709)
resets the recv_no_ibuf_operations in
recv_recovery_from_checkpoint_start(), but InnoDB fails to reset
the variable recv_no_log_write() during that time and that leads
to the assert failure.
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index f8b2cb95a3e..42b8e4dee88 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2416,8 +2416,6 @@ void recv_apply_hashed_log_recs(bool last_batch) recv_no_ibuf_operations = !last_batch || is_mariabackup_restore_or_export(); - ut_d(recv_no_log_write = recv_no_ibuf_operations); - if (ulint n = recv_sys->n_addrs) { const char* msg = last_batch ? "Starting final batch to recover " @@ -4002,6 +4000,7 @@ skip_apply: recv_sys->apply_log_recs = TRUE; recv_no_ibuf_operations = is_mariabackup_restore_or_export(); + ut_d(recv_no_log_write = recv_no_ibuf_operations); mutex_exit(&recv_sys->mutex); |