post-merge fixes for ec47beab

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;

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;

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;