commit e08c4ea941ac1b30685e55f48cd214ca7109777b
Author: Laurynas Biveinis <laurynas.biveinis@gmail.com>
Date:   Tue Mar 13 11:58:44 2018 +0200

    Squash with 70500: forgotten logs_empty_and_mark_files_at_shutdown bits

diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
index 9551598b5a1..ec21d006ab7 100644
--- a/storage/innobase/log/log0log.cc
+++ b/storage/innobase/log/log0log.cc
@@ -2376,9 +2376,13 @@ loop:
 	/* At this point only page_cleaner should be active. We wait
 	here to let it complete the flushing of the buffer pools
 	before proceeding further. */
+	ut_ad(buf_lru_manager_running_threads == srv_buf_pool_instances
+	      || buf_lru_manager_running_threads == 0);
 	srv_shutdown_state = SRV_SHUTDOWN_FLUSH_PHASE;
 	count = 0;
-	while (buf_page_cleaner_is_active) {
+	while (buf_page_cleaner_is_active
+	       || buf_lru_manager_running_threads > 0) {
+
 		++count;
 		os_thread_sleep(100000);
 		if (srv_print_verbose_log && count > 600) {