diff options
| author | unknown <istruewing@chilla.local> | 2007-02-01 08:09:36 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-01 08:09:36 +0100 |
| commit | 62fdcb54a7e03282b19b8661e0f78e766e3b2a36 (patch) | |
| tree | 048257cd44bd6d69572262aba31071a54e7992f1 /include/my_pthread.h | |
| parent | a94b1b50772271e1e4e72ddb237eff458380c0fa (diff) | |
| parent | 7be3cad45d0dccb3538fe797c9ac81358f92f691 (diff) | |
| download | mariadb-git-62fdcb54a7e03282b19b8661e0f78e766e3b2a36.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
into chilla.local:/home/mydev/mysql-4.1-axmrg
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysys/default.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
mysys/my_thr_init.c:
Manual merged
sql/mysqld.cc:
Manual merged
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index b852cfaad3d..3bcb30cd1f1 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -28,14 +28,6 @@ extern "C" { #endif /* __cplusplus */ -/* Thread library */ - -#define THD_LIB_OTHER 1 -#define THD_LIB_NPTL 2 -#define THD_LIB_LT 4 - -extern uint thd_lib_detected; - #if defined(__WIN__) || defined(OS2) #ifdef OS2 @@ -684,6 +676,15 @@ extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); */ extern pthread_t shutdown_th, main_th, signal_th; +/* Which kind of thread library is in use */ + +#define THD_LIB_OTHER 1 +#define THD_LIB_NPTL 2 +#define THD_LIB_LT 4 + +extern uint thd_lib_detected; +extern uint thr_client_alarm; + /* statistics_xxx functions are for not essential statistic */ #ifndef thread_safe_increment |