summaryrefslogtreecommitdiff
path: root/ext/mysql/libmysql/thr_mutex.c
diff options
context:
space:
mode:
authorMySQL Team <mysql@php.net>2001-06-01 20:07:26 +0000
committerMySQL Team <mysql@php.net>2001-06-01 20:07:26 +0000
commite8cbbc0637cb27c6fda64940a9138e08060475f8 (patch)
treef6353232aba5ae05c8f4779865cd742dc392b181 /ext/mysql/libmysql/thr_mutex.c
parent304ac03be434eecf6edc1f025c455e9089f8af37 (diff)
downloadphp-git-e8cbbc0637cb27c6fda64940a9138e08060475f8.tar.gz
Upgrade ext/mysql/libmysql to version 3.23.39. No major changes -
portability fixes. Also add configure test for HAVE_INT_8_16_32 which should solve compilation problems on AIX.
Diffstat (limited to 'ext/mysql/libmysql/thr_mutex.c')
-rw-r--r--ext/mysql/libmysql/thr_mutex.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/ext/mysql/libmysql/thr_mutex.c b/ext/mysql/libmysql/thr_mutex.c
index a6147b409a..7ec8bfb59a 100644
--- a/ext/mysql/libmysql/thr_mutex.c
+++ b/ext/mysql/libmysql/thr_mutex.c
@@ -29,19 +29,8 @@ int safe_mutex_init(safe_mutex_t *mp,
const pthread_mutexattr_t *attr __attribute__((unused)))
{
bzero((char*) mp,sizeof(*mp));
-#ifdef HAVE_LINUXTHREADS /* Some extra safety */
- {
- pthread_mutexattr_t tmp;
- pthread_mutexattr_init(&tmp);
- pthread_mutexattr_setkind_np(&tmp,PTHREAD_MUTEX_ERRORCHECK_NP);
- pthread_mutex_init(&mp->global,&tmp);
- pthread_mutex_init(&mp->mutex, &tmp);
- pthread_mutexattr_destroy(&tmp);
- }
-#else
- pthread_mutex_init(&mp->global,NULL);
+ pthread_mutex_init(&mp->global,MY_MUTEX_INIT_ERRCHK);
pthread_mutex_init(&mp->mutex,attr);
-#endif
return 0;
}