From 1750becf0d0c99acd26faf1de883af72592ae4e6 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Mar 2003 14:24:32 -0500 Subject: Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches client/mysql.cc: NetWare only: Remove pthread_yield on large screen results client/mysqldump.c: NetWare only: Remove pthread_yield on large screen results include/my_pthread.h: NetWare only: pthread_cond_timedwait now present in LibC mysys/default.c: Add conditional for NetWare mysys/my_init.c: Changes to netware_init mysys/my_pthread.c: NetWare only: special my_pthread_cond_timedwait no longer needed mysys/thr_mutex.c: NetWare: no need for pthread_mutex_lock calls netware/BUILD/mwenv: Add zlib to environment variables netware/Makefile.am: Add isam/isamchk.def to netware_build_files scripts/make_binary_distribution.sh: Made bin directory files more flexible for alternate platforms, without unnecessary repetition --- mysys/thr_mutex.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'mysys/thr_mutex.c') diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index 2aabe2f500a..3abac2dc737 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -241,11 +241,6 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp, fflush(stderr); abort(); } -#ifdef __NETWARE__ - /* NetWare doesn't re-acquire the mutex on an error */ - if (error && pthread_mutex_lock(&mp->mutex)) - mp->count--; -#endif /* __NETWARE__ */ mp->thread=pthread_self(); mp->file= (char*) file; mp->line=line; -- cgit v1.2.1