diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:43:54 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:43:54 +0200 |
| commit | 06115abdf96e381c251e8eff2a64a620b94a7431 (patch) | |
| tree | d5951b181993715df32dcab3394f692896eedf51 /sql/mysql_priv.h | |
| parent | 12c42b980aa94105a9108d4f58c5dc75d96ec824 (diff) | |
| parent | 733893ba502cfd1378ece9c1e0dbae98bf7ba9df (diff) | |
| download | mariadb-git-06115abdf96e381c251e8eff2a64a620b94a7431.tar.gz | |
merge from latest 5.1
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 664092adbc1..b0aff6e0034 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -670,6 +670,10 @@ enum enum_check_fields 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) { @@ -2022,6 +2026,10 @@ extern TABLE_LIST general_log, slow_log; extern FILE *bootstrap_file; extern int bootstrap_error; extern FILE *stderror_file; +/* + 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); extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_lock_db, LOCK_mapped_file,LOCK_user_locks, LOCK_status, |