diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc

index ca647368908..24b27d7462c 100644

--- a/storage/innobase/buf/buf0flu.cc

+++ b/storage/innobase/buf/buf0flu.cc

@@ -2718,25 +2718,6 @@ buf_flush_page_cleaner_init(void)

 	page_cleaner.is_running = true;

 }

-/**

-Close page_cleaner. */

-static

-void

-buf_flush_page_cleaner_close(void)

-{

-	ut_ad(!page_cleaner.is_running);

-

-	/* waiting for all worker threads exit */

-	while (page_cleaner.n_workers) {

-		os_thread_sleep(10000);

-	}

-

-	mutex_destroy(&page_cleaner.mutex);

-

-	os_event_destroy(page_cleaner.is_finished);

-	os_event_destroy(page_cleaner.is_requested);

-}

-

 /**

 Requests for all slots to flush all buffer pool instances.

 @param min_n	wished minimum mumber of blocks flushed

@@ -3438,9 +3419,17 @@ DECLARE_THREAD(buf_flush_page_cleaner_coordinator)(void*)

 	and no more access to page_cleaner structure by them.

 	Wakes worker threads up just to make them exit. */

 	page_cleaner.is_running = false;

-	os_event_set(page_cleaner.is_requested);

-	buf_flush_page_cleaner_close();

+	/* waiting for all worker threads exit */

+	while (page_cleaner.n_workers) {

+		os_event_set(page_cleaner.is_requested);

+		os_thread_sleep(10000);

+	}

+

+	mutex_destroy(&page_cleaner.mutex);

+

+	os_event_destroy(page_cleaner.is_finished);

+	os_event_destroy(page_cleaner.is_requested);

 	buf_page_cleaner_is_active = false;

scripts/mysql_install_db --no-defaults --innodb_buffer_pool_size=2G