diff options
| author | unknown <jani/jamppa@production.mysql.com> | 2007-01-30 17:52:27 +0100 |
|---|---|---|
| committer | unknown <jani/jamppa@production.mysql.com> | 2007-01-30 17:52:27 +0100 |
| commit | 7be3cad45d0dccb3538fe797c9ac81358f92f691 (patch) | |
| tree | b3ee358f5906df6c26015a18da7f9a34e7952361 /include | |
| parent | 2ec2fa6d08b9720307e8bc85aaa797fd05b565a2 (diff) | |
| parent | cdf6001aeb24d7085ab5f053b31858d95c382e06 (diff) | |
| download | mariadb-git-7be3cad45d0dccb3538fe797c9ac81358f92f691.tar.gz | |
Merge bk://localhost:5559
into production.mysql.com:/usersnfs/jamppa/mysql-4.0
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
mysys/default.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 9d5e78bba44..a336d4dc288 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -683,6 +683,7 @@ 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 */ |