diff options
| author | unknown <istruewing@chilla.local> | 2007-02-01 10:19:22 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-01 10:19:22 +0100 |
| commit | c7452cd6bc9db310fcbcc0e66e2b9913087f2910 (patch) | |
| tree | 022725674254e6cf9a1dda24210e53fd3dc844fd /include/my_pthread.h | |
| parent | 6aa2f37c833bc24b8442cc1b21a35f0f2fb7f07f (diff) | |
| parent | 622cbf39b068e1be2d6a8271a8a816ccf6b753f9 (diff) | |
| download | mariadb-git-c7452cd6bc9db310fcbcc0e66e2b9913087f2910.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
include/my_pthread.h:
Manual merged
mysys/default.c:
Manual 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 | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index cf6ae8cd6a1..6ebde2f119c 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -30,14 +30,6 @@ extern "C" { #define EXTERNC #endif /* __cplusplus */ -/* Thread library */ - -#define THD_LIB_OTHER 1 -#define THD_LIB_NPTL 2 -#define THD_LIB_LT 4 - -extern uint thd_lib_detected; - /* BUG#24507: Race conditions inside current NPTL pthread_exit() implementation. @@ -771,6 +763,16 @@ extern uint my_thread_end_wait_time; Keep track of shutdown,signal, and main threads so that my_end() will not report errors with them */ + +/* 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 |