diff options
| author | unknown <istruewing@chilla.local> | 2007-02-02 10:01:44 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-02 10:01:44 +0100 |
| commit | 5305cd7caf74919b1da4413a9923da1c0ff00734 (patch) | |
| tree | 2095b794c691b09421ab1f466b8228a82ff2ec7e /mysys | |
| parent | 5698114c979810308920e24225b4553aeb4a65da (diff) | |
| download | mariadb-git-5305cd7caf74919b1da4413a9923da1c0ff00734.tar.gz | |
After merge fix
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pthread.c | 3 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 09685ba3e12..14ba6aabf0e 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -31,7 +31,6 @@ #endif uint thd_lib_detected; -uint thr_client_alarm; #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) @@ -319,8 +318,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 34fa2e8aa7e..42f025c39f3 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -61,10 +61,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)) { |