Post-merge fix for MDEV-11638.

logs_empty_and_mark_files_at_shutdown(): Wait for the log_scrub_thread to exit.
MariaDB · Jan 5, 2017 · 30f27b0 · 30f27b0
1 parent a8ac6dc
commit 30f27b0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
@@ -2230,7 +2230,7 @@ logs_empty_and_mark_files_at_shutdown(void)
 	const ulint	n_flush	= log_sys->n_pending_flushes;
 	log_mutex_exit();
 
-	if (n_write != 0 || n_flush != 0) {
+	if (log_scrub_thread_active || n_write || n_flush) {
 		if (srv_print_verbose_log && count > 600) {
 			ib::info() << "Pending checkpoint_writes: " << n_write
 				<< ". Pending log flush writes: " << n_flush;