diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
| commit | ec91eea8dbae4276ff6e31a0d80c0b523f88ed88 (patch) | |
| tree | 8d1b9adecf56764c4198a42c3df6dbb1096ce49a /include | |
| parent | e4e55f7968d961e0cb07800397bc3108f960956a (diff) | |
| parent | c722e5f25f1f00b32f9b4b556f07489bda38095a (diff) | |
| download | mariadb-git-ec91eea8dbae4276ff6e31a0d80c0b523f88ed88.tar.gz | |
Local merge of mariadb-5.5.39
bzr merge -r4264 maria/5.5
Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
Diffstat (limited to 'include')
| -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); |