diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-23 10:56:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-23 10:56:00 +0200 |
| commit | 69bf55ffb6c38f802bf6ed4d9f97c90225835eab (patch) | |
| tree | 8ce1d2aad165c563822f638ad03ee608f81ff914 | |
| parent | 640f42311a72fa82bf7117c2791fc47ceb420361 (diff) | |
| parent | 787c47586e809c512d5e6dbd2b66645294ad0adc (diff) | |
| download | mariadb-git-69bf55ffb6c38f802bf6ed4d9f97c90225835eab.tar.gz | |
Merge 10.2 into 10.3
| -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 0d6d3015349..59087c76e37 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2377,8 +2377,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 " @@ -3931,6 +3929,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn) 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); |