diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-20 19:37:07 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-20 19:37:07 +0300 |
| commit | 0d788b1e91e77b50bcd03359ad052f4795ae1c09 (patch) | |
| tree | df5d441bed10a34a5a2157ad96f60a04046960b8 /mysys/thr_mutex.c | |
| parent | 5993b4947b23e4aca2dfc7b7f92b30f14e56c04f (diff) | |
| download | mariadb-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/thr_mutex.c')
| -rw-r--r-- | mysys/thr_mutex.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index 9d9c3a1ce08..73d1d24d9a4 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -218,9 +218,8 @@ int safe_mutex_destroy(safe_mutex_t *mp, const char *file, uint line) pthread_mutex_destroy(&mp->global); pthread_mutex_destroy(&mp->mutex); #else - if (pthread_mutex_destroy(&mp->global) || - pthread_mutex_destroy(&mp->mutex)) - error=1; + error= (int) (pthread_mutex_destroy(&mp->global) || + pthread_mutex_destroy(&mp->mutex)); #endif return error; } |