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

4 files changed, 1 insertions, 29 deletions

diff --git a/mysys/default.c b/mysys/default.c
index 83dd177f6b4..8811efc1190 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -244,7 +244,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
     strmov(name,config_file);
   }
   fn_format(name,name,"","",4);
-#if !defined(__WIN__) && !defined(OS2)
+#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
   {
     MY_STAT stat_info;
     if (!my_stat(name,&stat_info,MYF(0)))
diff --git a/mysys/my_init.c b/mysys/my_init.c
index fa1beaa3e35..60af337e69c 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -387,16 +387,6 @@ static void netware_init()
 	*name = tolower(*name);
       }
     }
-    /*
-      Set the current working directory to the base directory of the file
-      name (assuming the binary is in 'base-file-name/bin/'
-    */
-    strmov(cwd, my_progname);
-    if ((name= strindex(cwd, "/bin/")) != NULL)
-    {
-      *name= 0;
-      chdir(cwd);
-    }
   }
 }
 #endif /* __NETWARE__ */
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,
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;