diff options
author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-01-25 20:10:31 +0200 |
---|---|---|
committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-01-25 20:10:31 +0200 |
commit | 2ec2fa6d08b9720307e8bc85aaa797fd05b565a2 (patch) | |
tree | cb5306aa3b4e8ff2601826fc23c817fbc370292b /include/thr_alarm.h | |
parent | 454c763c6be44b34c8e1ff9b8561ab21e717b742 (diff) | |
download | mariadb-git-2ec2fa6d08b9720307e8bc85aaa797fd05b565a2.tar.gz |
Cleanup of thread-type (linuxthread or NTPL) detection code
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
include/my_global.h:
Fixed to be same as in 5.1
include/my_pthread.h:
Move things around to be more in line with rest of code
include/thr_alarm.h:
extern of thr_client_alarm
mysys/default.c:
Fixed two wrong pointer incrementations.
mysys/my_pthread.c:
Cleanup: Use variable thr_client_alarm
mysys/my_thr_init.c:
Detect thread library at startup
mysys/thr_alarm.c:
Set thr_client_alarm depending on which thread library we are using
sql/mysqld.cc:
Move get_thread_lib to mysys/my_pthread.c
Diffstat (limited to 'include/thr_alarm.h')
-rw-r--r-- | include/thr_alarm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 0c26a67acf4..ef6aaf49f77 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -93,6 +93,8 @@ typedef struct st_alarm { my_bool malloced; } ALARM; +extern uint thr_client_alarm; + #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) void init_thr_alarm(uint max_alarm); |