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 /sql/mysqld.h | |
| 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 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 32c29722d25..3d056fb95c7 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -82,7 +82,7 @@ enum enum_slave_parallel_mode { }; /* Function prototypes */ -void kill_mysql(THD *thd= 0); +void kill_mysql(THD *thd); void close_connection(THD *thd, uint sql_errno= 0); void handle_connection_in_main_thread(CONNECT *thd); void create_thread_to_handle_connection(CONNECT *connect); @@ -770,8 +770,6 @@ enum enum_query_type /* query_id */ extern query_id_t global_query_id; -void unireg_end(void); - /* increment query_id and return it. */ inline __attribute__((warn_unused_result)) query_id_t next_query_id() { |