From 2ec4163759bc19f5fc03cd5a0b1072afcdb16947 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Mar 2003 16:45:39 -0500 Subject: Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC client/mysql.cc: Remove unnecessary pthread_yield calls for NetWare client/mysqldump.c: Remove unnecessary pthread_yield calls for NetWare include/my_pthread.h: Special extern my_pthread_cond_timedwait no longer required for NetWare mysql-test/t/backup.test: replace_result added so test passes correctly on NetWare mysys/default.c: Add conditional to avoid non-applicable file checking on NetWare mysys/my_init.c: Remove working directory change from netware_init() mysys/my_pthread.c: Remove unnecessary NetWare version of my_pthread_cond_timedwait mysys/thr_mutex.c: Remove unnecessary NetWare block scripts/make_binary_distribution.sh: Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections --- mysys/my_pthread.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'mysys/my_pthread.c') diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 7ad4852558e..1eb15d92bc9 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -426,19 +426,6 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr) #endif -#ifdef __NETWARE__ -/* NetWare does not re-acquire the lock if the condition fails */ -int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, - struct timespec *abstime) -{ - int err= pthread_cond_timedwait(cond, mutex, abstime); - if (err) - pthread_mutex_lock(mutex); - return err; -} -#endif /* __NETWARE__ */ - - /***************************************************************************** Patches for HPUX We need these because the pthread_mutex.. code returns -1 on error, -- cgit v1.2.1