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 /include/thr_alarm.h | |
| 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 '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 fb7b9762b10..4127c9cb35e 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -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); |