diff options
| author | heikki@hundin.mysql.fi <> | 2003-04-24 23:03:00 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-04-24 23:03:00 +0300 |
| commit | 8a1eeca9be5b71a39e324e414e8a47e889528fce (patch) | |
| tree | 4fc03f312f1f684b860ef50a28d355f2c20a687c | |
| parent | 3866d3805727475df58a43e8b7acf9378f495471 (diff) | |
| download | mariadb-git-8a1eeca9be5b71a39e324e414e8a47e889528fce.tar.gz | |
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
| -rw-r--r-- | innobase/srv/srv0srv.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) { |