diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2019-01-25 14:24:35 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-01-29 11:56:35 +0400 |
commit | 8553525931fa34fb89f3bb12ffd07c99f4d436f5 (patch) | |
tree | 4d8d061c6b583b36f139994a409377a7d59e6ddb /plugin/feedback | |
parent | c2318291be7458238729ed80233ea71f1e6a62b8 (diff) | |
download | mariadb-git-8553525931fa34fb89f3bb12ffd07c99f4d436f5.tar.gz |
MDEV-18400 - Move shutdown handling to main thread
Signal handler is now respoinsible for setting abort_loop and breaking
poll() in main thread. The rest is handled by main thread itself.
Removed redundant LOCK_error_log init/destroy wrappers.
Removed redundant unireg_end(): it is trivial and it has only one caller.
Removed unused ready_to_exit from PFS.
Removed kill_in_progress: duplicates abort_loop.
Removed shutdown_in_progress: duplicates abort_loop.
Removed ready_to_exit: was used to make sure main thread waits for
cleanups, which are now done by main thread itself.
Removed SIGNALS_DONT_BREAK_READ, MAYBE_BROKEN_SYSCALL,
kill_broken_server: never defined/used.
Make clean_up() static.
Diffstat (limited to 'plugin/feedback')
-rw-r--r-- | plugin/feedback/sender_thread.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc index 591023d61fd..6ed5ed10cb2 100644 --- a/plugin/feedback/sender_thread.cc +++ b/plugin/feedback/sender_thread.cc @@ -137,7 +137,7 @@ static int prepare_for_fill(TABLE_LIST *tables) */ static bool going_down() { - return shutdown_plugin || shutdown_in_progress || (thd && thd->killed); + return shutdown_plugin || abort_loop || (thd && thd->killed); } /** |