summaryrefslogtreecommitdiff
path: root/mysys/thr_mutex.c
diff options
context:
space:
mode:
authorgreg@mysql.com <>2003-03-28 14:24:32 -0500
committergreg@mysql.com <>2003-03-28 14:24:32 -0500
commit080b73ee188b7528cfbcb04cbe9d76a794031136 (patch)
treee7d6d77bba01f8deac042852298bd68bae0527ad /mysys/thr_mutex.c
parenta83d0497d7b511f240df90a60a144b6c8485a917 (diff)
downloadmariadb-git-080b73ee188b7528cfbcb04cbe9d76a794031136.tar.gz
Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches
Diffstat (limited to 'mysys/thr_mutex.c')
-rw-r--r--mysys/thr_mutex.c5
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;