summaryrefslogtreecommitdiff
path: root/mysys/my_winthread.c
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 /mysys/my_winthread.c
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 'mysys/my_winthread.c')
-rw-r--r--mysys/my_winthread.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index 7a1e1365325..e410121af98 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.c
@@ -48,13 +48,13 @@ static pthread_handler_decl(pthread_start,param)
{
pthread_handler func=((struct pthread_map *) param)->func;
void *func_param=((struct pthread_map *) param)->param;
- my_thread_init();
- pthread_mutex_lock(&THR_LOCK_thread); /* Wait for beingthread to return */
+ my_thread_init(); /* Will always succeed in windows */
+ pthread_mutex_lock(&THR_LOCK_thread); /* Wait for beginthread to return */
win_pthread_self=((struct pthread_map *) param)->pthreadself;
pthread_mutex_unlock(&THR_LOCK_thread);
- free((char*) param);
+ free((char*) param); /* Free param from create */
pthread_exit((*func)(func_param));
- return 0;
+ return 0; /* Safety */
}