diff options
Diffstat (limited to 'innobase/srv/srv0srv.c')
| -rw-r--r-- | innobase/srv/srv0srv.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index d0ac011e60f..95bcd2351cd 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -2825,7 +2825,11 @@ background_loop: srv_main_thread_op_info = (char*)"purging"; - n_pages_purged = trx_purge(); + 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"; @@ -2837,7 +2841,12 @@ background_loop: mutex_exit(&kernel_mutex); srv_main_thread_op_info = (char*)"doing insert buffer merge"; - n_bytes_merged = ibuf_contract_for_n_pages(TRUE, 20); + + 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"; |