diff options
author | istruewing@chilla.local <> | 2007-02-02 11:34:22 +0100 |
---|---|---|
committer | istruewing@chilla.local <> | 2007-02-02 11:34:22 +0100 |
commit | 80ca34c3a855fb872570b0b64a298a6c54439795 (patch) | |
tree | 004378d4e23f0c766f85ef1c4f0c38b9dfbf7ab6 /mysys/my_pthread.c | |
parent | ed099870832bbb0ce0c4be13554e30e7adcd259c (diff) | |
parent | 1616e201d8e6af7cd92335c4b91fd955224f1751 (diff) | |
download | mariadb-git-80ca34c3a855fb872570b0b64a298a6c54439795.tar.gz |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
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 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; |