summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authoristruewing@chilla.local <>2007-02-01 10:19:22 +0100
committeristruewing@chilla.local <>2007-02-01 10:19:22 +0100
commit1c34270464d241148bbcf8abeb80a96f390561fe (patch)
tree022725674254e6cf9a1dda24210e53fd3dc844fd /include/my_pthread.h
parenta3705af35f717fbee1104ed56b5c96d25fdae418 (diff)
parent73e61944f78ef617655e0677f87d8728cf1754db (diff)
downloadmariadb-git-1c34270464d241148bbcf8abeb80a96f390561fe.tar.gz
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index cf6ae8cd6a1..6ebde2f119c 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -30,14 +30,6 @@ extern "C" {
#define EXTERNC
#endif /* __cplusplus */
-/* Thread library */
-
-#define THD_LIB_OTHER 1
-#define THD_LIB_NPTL 2
-#define THD_LIB_LT 4
-
-extern uint thd_lib_detected;
-
/*
BUG#24507: Race conditions inside current NPTL pthread_exit() implementation.
@@ -771,6 +763,16 @@ extern uint my_thread_end_wait_time;
Keep track of shutdown,signal, and main threads so that my_end() will not
report errors with them
*/
+
+/* Which kind of thread library is in use */
+
+#define THD_LIB_OTHER 1
+#define THD_LIB_NPTL 2
+#define THD_LIB_LT 4
+
+extern uint thd_lib_detected;
+extern uint thr_client_alarm;
+
/* statistics_xxx functions are for not essential statistic */
#ifndef thread_safe_increment