summaryrefslogtreecommitdiff
path: root/mysys/thr_mutex.c
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-09-20 19:37:07 +0300
committermonty@donna.mysql.com <>2000-09-20 19:37:07 +0300
commit830d30896066b325d1ee0769ca116efdaef602f2 (patch)
treedf5d441bed10a34a5a2157ad96f60a04046960b8 /mysys/thr_mutex.c
parent2780278f35ae9ec1a73fb4d5ecedecf9f44d0c8b (diff)
downloadmariadb-git-830d30896066b325d1ee0769ca116efdaef602f2.tar.gz
Fix for SAFE_MUTEX on windows
Diffstat (limited to 'mysys/thr_mutex.c')
-rw-r--r--mysys/thr_mutex.c5
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;
}