diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-23 14:11:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-23 14:11:08 +0200 |
| commit | 3c9d03eddaf9a928bf8391a1265df322c7404d88 (patch) | |
| tree | d231484e15393bfacc9ccddefb08f06b23b44e32 /storage | |
| parent | 245d33db4e0586df4fe28362fb002cef0151a1c9 (diff) | |
| parent | 69bf55ffb6c38f802bf6ed4d9f97c90225835eab (diff) | |
| download | mariadb-git-3c9d03eddaf9a928bf8391a1265df322c7404d88.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage')
| -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 461cf470d62..e9d9c349241 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -2303,8 +2303,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) { if (!log_sys.log.subformat && !srv_force_recovery && srv_undo_tablespaces_open) { @@ -3872,6 +3870,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); |