From 8553525931fa34fb89f3bb12ffd07c99f4d436f5 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 25 Jan 2019 14:24:35 +0400 Subject: 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. --- sql/sql_class.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'sql/sql_class.h') diff --git a/sql/sql_class.h b/sql/sql_class.h index 1a0e1113c33..c20dbe7d409 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -184,8 +184,6 @@ extern char internal_table_name[2]; extern char empty_c_string[1]; extern MYSQL_PLUGIN_IMPORT const char **errmesg; -extern bool volatile shutdown_in_progress; - extern "C" LEX_STRING * thd_query_string (MYSQL_THD thd); extern "C" size_t thd_query_safe(MYSQL_THD thd, char *buf, size_t buflen); -- cgit v1.2.1