From 616ca7f6058746f47d6b2b74e5c8b82ccadf019f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Apr 2003 23:03:00 +0300 Subject: srv0srv.c: Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown innobase/srv/srv0srv.c: Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown --- innobase/srv/srv0srv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'innobase') diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index f360cf25900..d90b818ad4b 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -2802,6 +2802,11 @@ loop: goto suspend_thread; } + if (srv_fast_shutdown && srv_shutdown_state > 0) { + + goto background_loop; + } + /* We flush the log once in a second even if no commit is issued or the we have specified in my.cnf no flush at transaction commit */ @@ -2829,11 +2834,6 @@ loop: log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP); log_flush_to_disk(); } - - if (srv_fast_shutdown && srv_shutdown_state > 0) { - - goto background_loop; - } if (srv_activity_count == old_activity_count) { -- cgit v1.2.1