database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2007-02-01 10:19:22 +01:00
parent ad7a4ebbe3 62fdcb54a7
commit 8772cb168b
7 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/thr_alarm.h
View File

@@ -92,6 +92,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);