Skip to content

Commit 30f27b0

Browse files
committed
Post-merge fix for MDEV-11638.
logs_empty_and_mark_files_at_shutdown(): Wait for the log_scrub_thread to exit.
1 parent a8ac6dc commit 30f27b0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

storage/innobase/log/log0log.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2230,7 +2230,7 @@ logs_empty_and_mark_files_at_shutdown(void)
22302230
const ulint n_flush = log_sys->n_pending_flushes;
22312231
log_mutex_exit();
22322232

2233-
if (n_write != 0 || n_flush != 0) {
2233+
if (log_scrub_thread_active || n_write || n_flush) {
22342234
if (srv_print_verbose_log && count > 600) {
22352235
ib::info() << "Pending checkpoint_writes: " << n_write
22362236
<< ". Pending log flush writes: " << n_flush;

0 commit comments

Comments
 (0)