diff options
| -rw-r--r-- | storage/innobase/srv/srv0srv.c | 4 | ||||
| -rw-r--r-- | storage/innodb_plugin/srv/srv0srv.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c index e5619abbe45..f615384777c 100644 --- a/storage/innobase/srv/srv0srv.c +++ b/storage/innobase/srv/srv0srv.c @@ -2432,7 +2432,7 @@ loop: by x100 (1purge/100msec), to speed up debug scripts which should wait for purged. */ - if (!skip_sleep) { + if (!skip_sleep && !srv_shutdown_state) { os_thread_sleep(100000); } @@ -2448,7 +2448,7 @@ loop: } while (n_pages_purged); } else #endif /* UNIV_DEBUG */ - if (!skip_sleep) { + if (!skip_sleep && !srv_shutdown_state) { os_thread_sleep(1000000); } diff --git a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c index f27f9e37c31..a54a8088a9b 100644 --- a/storage/innodb_plugin/srv/srv0srv.c +++ b/storage/innodb_plugin/srv/srv0srv.c @@ -2518,7 +2518,7 @@ loop: by x100 (1purge/100msec), to speed up debug scripts which should wait for purged. */ - if (!skip_sleep) { + if (!skip_sleep && !srv_shutdown_state) { os_thread_sleep(100000); srv_main_sleeps++; } @@ -2535,7 +2535,7 @@ loop: } while (n_pages_purged); } else #endif /* UNIV_DEBUG */ - if (!skip_sleep) { + if (!skip_sleep && !srv_shutdown_state) { os_thread_sleep(1000000); srv_main_sleeps++; |