summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-09-20 19:37:07 +0300
committerunknown <monty@donna.mysql.com>2000-09-20 19:37:07 +0300
commit0d788b1e91e77b50bcd03359ad052f4795ae1c09 (patch)
treedf5d441bed10a34a5a2157ad96f60a04046960b8 /include/my_pthread.h
parent5993b4947b23e4aca2dfc7b7f92b30f14e56c04f (diff)
downloadmariadb-git-0d788b1e91e77b50bcd03359ad052f4795ae1c09.tar.gz
Fix for SAFE_MUTEX on windows
Docs/manual.texi: cleanup include/my_pthread.h: Fix for SAFEMUTEX under windows mysys/my_thr_init.c: Fix for SAFEMUTEX under windows mysys/my_winthread.c: Fix for SAFEMUTEX under windows mysys/thr_mutex.c: Fix for SAFEMUTEX under windows sql/mysqld.cc: Remove unused code sql/sql_table.cc: Fix filename comparison on Windows support-files/Makefile.am: Added magic file
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index d5f3fa735b2..71ad5e42bf2 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -85,6 +85,7 @@ void pthread_exit(unsigned A); /* was #define pthread_exit(A) ExitThread(A)*/
#define HAVE_PTHREAD_ATTR_SETSTACKSIZE
#ifdef USE_TLS /* For LIBMYSQL.DLL */
+#undef SAFE_MUTEX /* This will cause conflicts */
#define pthread_key(T,V) DWORD V
#define pthread_key_create(A,B) ((*A=TlsAlloc())==0xFFFFFFFF)
#define pthread_getspecific(A) (TlsGetValue(A))