diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
| commit | 7cb2e2d1dce2c7466388f4a6ade0614564be82fc (patch) | |
| tree | 8de3d7e1875b8751450433ee53331ffb7322e7b5 /include/my_pthread.h | |
| parent | 0e5f0023b3405449c8e3371cb67989f1c1fbb3f7 (diff) | |
| parent | 32113efe2a7d32bfa5820cda37164436a53719cc (diff) | |
| download | mariadb-git-7cb2e2d1dce2c7466388f4a6ade0614564be82fc.tar.gz | |
merge with 3.23
BitKeeper/deleted/.del-rpl_empty_master_crash.result:
Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
Auto merged
include/my_net.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 62088fc56cb..fda31b9d4f2 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -349,7 +349,7 @@ extern void my_pthread_attr_setprio(pthread_attr_t *attr, int priority); #undef HAVE_GETHOSTBYADDR_R /* No definition */ #endif -#if defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) +#if defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) && !defined(SAFE_MUTEX) extern int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *abstime); |