diff options
| author | unknown <istruewing@chilla.local> | 2007-02-02 11:34:22 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-02 11:34:22 +0100 |
| commit | 141080fac5d735ae690ebd06db8be49354902f12 (patch) | |
| tree | 004378d4e23f0c766f85ef1c4f0c38b9dfbf7ab6 | |
| parent | baddc8bdca29b6e5dad37850ce3012cb60d0afa4 (diff) | |
| parent | d03d298735ed922f29c3f994c21ffcd53ce33598 (diff) | |
| download | mariadb-git-141080fac5d735ae690ebd06db8be49354902f12.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
include/my_pthread.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
| -rw-r--r-- | include/my_pthread.h | 1 | ||||
| -rw-r--r-- | include/thr_alarm.h | 1 | ||||
| -rw-r--r-- | mysys/my_pthread.c | 3 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 4 |
4 files changed, 1 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 66a28ec5654..6b97d87ab7d 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -698,7 +698,6 @@ extern uint my_thread_end_wait_time; #define THD_LIB_LT 4 extern uint thd_lib_detected; -extern uint thr_client_alarm; /* statistics_xxx functions are for not essential statistic */ diff --git a/include/thr_alarm.h b/include/thr_alarm.h index f5e73fc2b7a..13940e88c08 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -85,6 +85,7 @@ typedef struct st_alarm { } 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) diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index a7bb75d25a8..2bfae397c85 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -30,7 +30,6 @@ #endif uint thd_lib_detected; -uint thr_client_alarm; #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) @@ -315,8 +314,6 @@ void sigwait_handle_sig(int sig) pthread_mutex_unlock(&LOCK_sigwait); } -extern pthread_t alarm_thread; - void *sigwait_thread(void *set_arg) { sigset_t *set=(sigset_t*) set_arg; diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 9d706883869..bb502846331 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -80,10 +80,6 @@ static uint get_thread_lib(void); my_bool my_thread_global_init(void) { thd_lib_detected= get_thread_lib(); - if (thd_lib_detected == THD_LIB_LT) - thr_client_alarm= SIGALRM; - else - thr_client_alarm= SIGUSR1; if (pthread_key_create(&THR_KEY_mysys,0)) { |