mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
This commit is contained in:
@ -29,6 +29,9 @@
|
||||
#define SCHED_POLICY SCHED_OTHER
|
||||
#endif
|
||||
|
||||
uint thd_lib_detected;
|
||||
uint thr_client_alarm;
|
||||
|
||||
#ifndef my_pthread_setprio
|
||||
void my_pthread_setprio(pthread_t thread_id,int prior)
|
||||
{
|
||||
@ -332,7 +335,9 @@ void *sigwait_thread(void *set_arg)
|
||||
sigaction(i, &sact, (struct sigaction*) 0);
|
||||
}
|
||||
}
|
||||
sigaddset(set,THR_CLIENT_ALARM);
|
||||
/* 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 */
|
||||
|
||||
|
Reference in New Issue
Block a user