diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /include/thread_pool_priv.h | |
parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
Diffstat (limited to 'include/thread_pool_priv.h')
-rw-r--r-- | include/thread_pool_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h index 9a9c65af6da..a199923ff00 100644 --- a/include/thread_pool_priv.h +++ b/include/thread_pool_priv.h @@ -1,6 +1,6 @@ #error don't use /* - 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 @@ -50,6 +50,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_lock_data(THD *thd); |