diff options
| author | unknown <istruewing@chilla.local> | 2007-02-02 10:03:22 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-02 10:03:22 +0100 |
| commit | d03d298735ed922f29c3f994c21ffcd53ce33598 (patch) | |
| tree | e10387853f4838bee7b858b6cd2e475b081c0c75 /mysys/my_pthread.c | |
| parent | cd4670a7aa270c655dd9a7a45d0c1e05b6f25dd0 (diff) | |
| parent | 5305cd7caf74919b1da4413a9923da1c0ff00734 (diff) | |
| download | mariadb-git-d03d298735ed922f29c3f994c21ffcd53ce33598.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-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
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index afdce8342a6..b9da9d4817a 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) @@ -318,8 +317,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; |