diff options
| author | unknown <greg@mysql.com> | 2003-03-28 14:24:32 -0500 |
|---|---|---|
| committer | unknown <greg@mysql.com> | 2003-03-28 14:24:32 -0500 |
| commit | 9c3d7df569998425c55312bfc6a890346762d26e (patch) | |
| tree | e7d6d77bba01f8deac042852298bd68bae0527ad /mysys/thr_mutex.c | |
| parent | 9dc2425066d69f8d0084e115a67846929972cf3f (diff) | |
| download | mariadb-git-9c3d7df569998425c55312bfc6a890346762d26e.tar.gz | |
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
Diffstat (limited to 'mysys/thr_mutex.c')
| -rw-r--r-- | mysys/thr_mutex.c | 5 |
1 files changed, 0 insertions, 5 deletions
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; |