diff options
| author | unknown <istruewing@chilla.local> | 2007-02-01 10:19:22 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-01 10:19:22 +0100 |
| commit | 8772cb168b43528a2fcef03ece3078f58cb34d40 (patch) | |
| tree | 022725674254e6cf9a1dda24210e53fd3dc844fd /mysys/my_pthread.c | |
| parent | ad7a4ebbe31d3bd6113e5f26107db6fffaddea1c (diff) | |
| parent | 62fdcb54a7e03282b19b8661e0f78e766e3b2a36 (diff) | |
| download | mariadb-git-8772cb168b43528a2fcef03ece3078f58cb34d40.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
include/my_pthread.h:
Manual merged
mysys/default.c:
Manual merged
mysys/my_thr_init.c:
Manual merged
sql/mysqld.cc:
Manual merged
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index ce80dc014c2..afdce8342a6 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -30,6 +30,7 @@ #endif uint thd_lib_detected; +uint thr_client_alarm; #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) @@ -337,7 +338,9 @@ void *sigwait_thread(void *set_arg) sigaction(i, &sact, (struct sigaction*) 0); } } - sigaddset(set, thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1); + /* Ensure that init_thr_alarm() is called */ + DBUG_ASSERT(thr_client_alarm); + sigaddset(set, thr_client_alarm); pthread_sigmask(SIG_UNBLOCK,(sigset_t*) set,(sigset_t*) 0); alarm_thread=pthread_self(); /* For thr_alarm */ |