summaryrefslogtreecommitdiff
path: root/mysys/mysys_priv.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@linux-rbsx>2009-12-19 03:21:49 +0100
committerVladislav Vaintroub <vvaintroub@linux-rbsx>2009-12-19 03:21:49 +0100
commit106bb1652ed8918ee580e0aa83d59bf46053f7e9 (patch)
tree9ccfada701764a2476975250d029acbe812b12b1 /mysys/mysys_priv.h
parent27c0d595e9e3a35232672209219ecc9b74004ab4 (diff)
parent4e8d1c6bf30abfd45a993b058ff2a33d4671b73d (diff)
downloadmariadb-git-106bb1652ed8918ee580e0aa83d59bf46053f7e9.tar.gz
merge
Diffstat (limited to 'mysys/mysys_priv.h')
-rw-r--r--mysys/mysys_priv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 23cc24d2fcb..84c457da4c9 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@@ -59,9 +59,9 @@ extern PSI_thread_key key_thread_alarm;
#endif /* HAVE_PSI_INTERFACE */
-extern pthread_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache;
-extern pthread_mutex_t THR_LOCK_lock, THR_LOCK_isam, THR_LOCK_net;
-extern pthread_mutex_t THR_LOCK_charset, THR_LOCK_time;
+extern mysql_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache;
+extern mysql_mutex_t THR_LOCK_lock, THR_LOCK_isam, THR_LOCK_net;
+extern mysql_mutex_t THR_LOCK_charset, THR_LOCK_time;
#else /* THREAD */
#include <my_no_pthread.h>
#endif /* THREAD */