diff --git a/include/mysql/thread_pool_priv.h b/include/mysql/thread_pool_priv.h index efc264b713d..1da174e5f8b 100644 --- a/include/mysql/thread_pool_priv.h +++ b/include/mysql/thread_pool_priv.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,6 +49,8 @@ void thd_clear_errors(THD *thd); void thd_set_thread_stack(THD *thd, char *stack_start); void thd_lock_thread_count(THD *thd); void thd_unlock_thread_count(THD *thd); +void thd_lock_thread_remove(THD *thd); +void thd_unlock_thread_remove(THD *thd); void thd_close_connection(THD *thd); THD *thd_get_current_thd(); void thd_new_connection_setup(THD *thd, char *stack_start); diff --git a/mysql-test/r/show_processlist.result b/mysql-test/r/show_processlist.result new file mode 100644 index 00000000000..f133e480e1a --- /dev/null +++ b/mysql-test/r/show_processlist.result @@ -0,0 +1,47 @@ +Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST, +SHOW BINLOGS +connect connection1,127.0.0.1,root,,test,$MASTER_MYPORT,; +connection default; +SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go'; +SHOW PROCESSLIST; +connection connection1; +"Wait_for parked1" +SET DEBUG_SYNC='now WAIT_FOR parked1'; +connect connection2,127.0.0.1,root,,test,$MASTER_MYPORT,; +connect connection3,127.0.0.1,root,,test,$MASTER_MYPORT,; +SET DEBUG_SYNC='now SIGNAL go'; +connection default; +Id User Host db Command Time State Info + root test