Merge 10.3 into 10.4

MariaDB · Feb 23, 2021 · 3c9d03e · 3c9d03e
2 parents 245d33d + 69bf55f
commit 3c9d03e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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);