mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.2 into 10.3

Browse source
This commit is contained in:
Marko Mäkelä 2021-02-23 10:56:00 +02:00
commit 69bf55ffb6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
storage/innobase/log/log0recv.cc
View file

@ -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);