diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2007-02-07 01:37:21 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2007-02-07 01:37:21 +0400 |
| commit | efc2771dde0c8407ac5b0dd8e83ac58ba8853076 (patch) | |
| tree | d528e3ead8992fb52e054d28992ba3843c068e9a /include | |
| parent | c52165de13ca62c2a596ea05c01e07807432d605 (diff) | |
| download | mariadb-git-efc2771dde0c8407ac5b0dd8e83ac58ba8853076.tar.gz | |
Excluded wrongly merged changeset.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 9 | ||||
| -rw-r--r-- | include/thr_alarm.h | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 4d9f5350b1e..a3e1007bf31 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -690,15 +690,6 @@ 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; - /* statistics_xxx functions are for not essential statistic */ #ifndef thread_safe_increment diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 13940e88c08..90f785c022f 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -24,6 +24,11 @@ extern "C" { #ifndef USE_ALARM_THREAD #define USE_ONE_SIGNAL_HAND /* One must call process_alarm */ #endif +#ifdef HAVE_LINUXTHREADS +#define THR_CLIENT_ALARM SIGALRM +#else +#define THR_CLIENT_ALARM SIGUSR1 +#endif #ifdef HAVE_rts_threads #undef USE_ONE_SIGNAL_HAND #define USE_ALARM_THREAD @@ -84,9 +89,6 @@ typedef struct st_alarm { my_bool malloced; } ALARM; -extern uint thr_client_alarm; -extern pthread_t alarm_thread; - #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) void init_thr_alarm(uint max_alarm); |