diff options
| author | unknown <istruewing@chilla.local> | 2007-02-02 10:03:22 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-02 10:03:22 +0100 |
| commit | d03d298735ed922f29c3f994c21ffcd53ce33598 (patch) | |
| tree | e10387853f4838bee7b858b6cd2e475b081c0c75 /include/thr_alarm.h | |
| parent | cd4670a7aa270c655dd9a7a45d0c1e05b6f25dd0 (diff) | |
| parent | 5305cd7caf74919b1da4413a9923da1c0ff00734 (diff) | |
| download | mariadb-git-d03d298735ed922f29c3f994c21ffcd53ce33598.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-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
Diffstat (limited to 'include/thr_alarm.h')
| -rw-r--r-- | include/thr_alarm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 4127c9cb35e..fe0a8f21b92 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -93,6 +93,7 @@ typedef struct st_alarm { } ALARM; extern uint thr_client_alarm; +extern pthread_t alarm_thread; #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) |