diff options
| author | istruewing@chilla.local <> | 2007-02-02 10:01:44 +0100 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-02-02 10:01:44 +0100 |
| commit | 3a664472de14322bb635baeec59d9c8bec0026c2 (patch) | |
| tree | 2095b794c691b09421ab1f466b8228a82ff2ec7e /include | |
| parent | 33e1d1091ab9883cf07d56154c2bcf561d5a43df (diff) | |
| download | mariadb-git-3a664472de14322bb635baeec59d9c8bec0026c2.tar.gz | |
After merge fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 1 | ||||
| -rw-r--r-- | include/thr_alarm.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 3bcb30cd1f1..14dbc9825d4 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -683,7 +683,6 @@ extern pthread_t shutdown_th, main_th, signal_th; #define THD_LIB_LT 4 extern uint thd_lib_detected; -extern uint thr_client_alarm; /* statistics_xxx functions are for not essential statistic */ diff --git a/include/thr_alarm.h b/include/thr_alarm.h index ef6aaf49f77..1d7ebbcb9f5 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -94,6 +94,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) |