diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 13:53:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 13:54:44 +0200 |
| commit | ec59220f2c83945026e829b353e3bda84ad41a7a (patch) | |
| tree | a31cc2365899339fa0d455bb171458f759077e34 | |
| parent | 025c4ec191e46719d3c51af6ee7a0ecc7a7dd335 (diff) | |
| download | mariadb-git-ec59220f2c83945026e829b353e3bda84ad41a7a.tar.gz | |
post-merge fixes for ec47bea
| -rw-r--r-- | sql/mysqld.cc | 3 | ||||
| -rw-r--r-- | sql/slave.cc | 1 | ||||
| -rw-r--r-- | sql/sql_class.h | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 4e7ae9e120d..68587592bc6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -10301,7 +10301,8 @@ PSI_stage_info *all_server_stages[]= & stage_master_gtid_wait, & stage_gtid_wait_other_connection, & stage_slave_background_process_request, - & stage_slave_background_wait_request + & stage_slave_background_wait_request, + & stage_waiting_for_deadlock_kill }; PSI_socket_key key_socket_tcpip, key_socket_unix, key_socket_client_connection; diff --git a/sql/slave.cc b/sql/slave.cc index 8385d8f81a1..08cbf9acb6a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -366,6 +366,7 @@ handle_slave_background(void *arg __attribute__((unused))) delete thd; thread_safe_decrement32(&service_thread_count); + signal_thd_deleted(); my_thread_end(); return 0; diff --git a/sql/sql_class.h b/sql/sql_class.h index 019aca1dcf9..7cad0fa25c7 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1529,8 +1529,7 @@ enum enum_thread_type SYSTEM_THREAD_EVENT_SCHEDULER= 8, SYSTEM_THREAD_EVENT_WORKER= 16, SYSTEM_THREAD_BINLOG_BACKGROUND= 32, - SYSTEM_THREAD_SLAVE_INIT= 64, - SYSTEM_THREAD_SLAVE_BACKGROUND= 128 + SYSTEM_THREAD_SLAVE_BACKGROUND= 64 }; inline char const * @@ -1545,7 +1544,7 @@ show_system_thread(enum_thread_type thread) RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_SQL); RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_SCHEDULER); RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER); - RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_INIT); + RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_BACKGROUND); default: sprintf(buf, "<UNKNOWN SYSTEM THREAD: %d>", thread); return buf; |