summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-04-27 13:30:00 +0200
committerunknown <msvensson@neptunus.(none)>2005-04-27 13:30:00 +0200
commit54c5950c131d353fcae243820a03114e8517c9c2 (patch)
tree3d2758d0be3ff6e6e15ed711ea8f9f060a82407c /include/my_pthread.h
parent6d5dd516270187bccf0ff356a87b91b64befa730 (diff)
parentc49d7f489106792e4924dfc31657abe4ab0d2d79 (diff)
downloadmariadb-git-54c5950c131d353fcae243820a03114e8517c9c2.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0 include/my_pthread.h: Auto merged
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index a84effda2dd..47a38d1a642 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -612,6 +612,12 @@ extern pthread_mutexattr_t my_fast_mutexattr;
#else
#define MY_MUTEX_INIT_FAST NULL
#endif
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+extern pthread_mutexattr_t my_errorcheck_mutexattr;
+#define MY_MUTEX_INIT_ERRCHK &my_errorcheck_mutexattr
+#else
+#define MY_MUTEX_INIT_ERRCHK NULL
+#endif
extern my_bool my_thread_global_init(void);
extern void my_thread_global_end(void);