summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authoristruewing@chilla.local <>2007-02-02 11:34:22 +0100
committeristruewing@chilla.local <>2007-02-02 11:34:22 +0100
commit80ca34c3a855fb872570b0b64a298a6c54439795 (patch)
tree004378d4e23f0c766f85ef1c4f0c38b9dfbf7ab6 /include/my_pthread.h
parented099870832bbb0ce0c4be13554e30e7adcd259c (diff)
parent1616e201d8e6af7cd92335c4b91fd955224f1751 (diff)
downloadmariadb-git-80ca34c3a855fb872570b0b64a298a6c54439795.tar.gz
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 66a28ec5654..6b97d87ab7d 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -698,7 +698,6 @@ extern uint my_thread_end_wait_time;
#define THD_LIB_LT 4
extern uint thd_lib_detected;
-extern uint thr_client_alarm;
/* statistics_xxx functions are for not essential statistic */