database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge chilla.local:/home/mydev/mysql-5.0-axmrg

Browse Source 
into  chilla.local:/home/mydev/mysql-5.1-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
This commit is contained in:
unknown
2007-02-02 11:34:22 +01:00
parent baddc8bdca d03d298735
commit 141080fac5
4 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/my_pthread.h
View File

@@ -698,7 +698,6 @@ extern uint my_thread_end_wait_time;
#define THD_LIB_LT 4 #define THD_LIB_LT 4
extern uint thd_lib_detected; extern uint thd_lib_detected;
extern uint thr_client_alarm;
/* statistics_xxx functions are for not essential statistic */ /* statistics_xxx functions are for not essential statistic */

1
include/thr_alarm.h
View File

@@ -85,6 +85,7 @@ typedef struct st_alarm {
} ALARM; } ALARM;
extern uint thr_client_alarm; extern uint thr_client_alarm;
extern pthread_t alarm_thread;
#define thr_alarm_init(A) (*(A))=0 #define thr_alarm_init(A) (*(A))=0
#define thr_alarm_in_use(A) (*(A)!= 0) #define thr_alarm_in_use(A) (*(A)!= 0)

3
mysys/my_pthread.c
View File

@@ -30,7 +30,6 @@
#endif #endif
uint thd_lib_detected; uint thd_lib_detected;
uint thr_client_alarm;
#ifndef my_pthread_setprio #ifndef my_pthread_setprio
void my_pthread_setprio(pthread_t thread_id,int prior) 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); pthread_mutex_unlock(&LOCK_sigwait);
} }
extern pthread_t alarm_thread;
void *sigwait_thread(void *set_arg) void *sigwait_thread(void *set_arg)
{ {
sigset_t *set=(sigset_t*) set_arg; sigset_t *set=(sigset_t*) set_arg;

4
mysys/my_thr_init.c
View File

@@ -80,10 +80,6 @@ static uint get_thread_lib(void);
my_bool my_thread_global_init(void) my_bool my_thread_global_init(void)
{ {
thd_lib_detected= get_thread_lib(); 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)) if (pthread_key_create(&THR_KEY_mysys,0))
{ {