diff options
| author | Mayank Prasad <mayank.prasad@oracle.com> | 2011-05-18 19:47:29 +0530 |
|---|---|---|
| committer | Mayank Prasad <mayank.prasad@oracle.com> | 2011-05-18 19:47:29 +0530 |
| commit | 47f7fc4353f4ee665b703bee6479ad1664db0f48 (patch) | |
| tree | 388d5a17eecb020be35658a7d2e81cedc23805ec /sql/mysqld.h | |
| parent | b7ed314fab7104230a3f5559e2c030a12a24eef7 (diff) | |
| download | mariadb-git-47f7fc4353f4ee665b703bee6479ad1664db0f48.tar.gz | |
merge from 5.1 for bug#11764633
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 303ee5bec0f..d2366224b3f 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -216,6 +216,10 @@ extern char err_shared_dir[]; extern TYPELIB thread_handling_typelib; extern my_decimal decimal_zero; +/* + THR_MALLOC is a key which will be used to set/get MEM_ROOT** for a thread, + using my_pthread_setspecific_ptr()/my_thread_getspecific_ptr(). +*/ extern pthread_key(MEM_ROOT**,THR_MALLOC); #ifdef HAVE_PSI_INTERFACE @@ -503,6 +507,10 @@ get_thread_running() extern "C" THD *_current_thd_noinline(); #define _current_thd() _current_thd_noinline() #else +/* + THR_THD is a key which will be used to set/get THD* for a thread, + using my_pthread_setspecific_ptr()/my_thread_getspecific_ptr(). +*/ extern pthread_key(THD*, THR_THD); inline THD *_current_thd(void) { |