Commit d7bf8c2e authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

srv0srv.c: 

  The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that
parent 40718fe5

innobase/srv/srv0srv.c

+11 −2
Original line number Diff line number Diff line
@@ -2819,7 +2819,11 @@ srv_master_thread( 
		

	srv_main_thread_op_info = (char*)"purging";



	if (srv_fast_shutdown && srv_shutdown_state > 0) {

	        n_pages_purged = 0;

	} else {

	        n_pages_purged = trx_purge();

	}



	srv_main_thread_op_info = (char*)"reserving kernel mutex";
@@ -2831,7 +2835,12 @@ srv_master_thread( 
	mutex_exit(&kernel_mutex);



	srv_main_thread_op_info = (char*)"doing insert buffer merge";



	if (srv_fast_shutdown && srv_shutdown_state > 0) {

	        n_bytes_merged = 0;

	} else {

	        n_bytes_merged = ibuf_contract_for_n_pages(TRUE, 20);

	}



	srv_main_thread_op_info = (char*)"reserving kernel mutex";