WL#5486: Remove code for unsupported platforms

Remove Netware specific code.

18 files changed, 23 insertions, 381 deletions

diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index f4fab89d5a5..a9e3f16c548 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -51,7 +51,7 @@ libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
 			my_net.c my_port.c my_sleep.c \
 			charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
 			my_gethostbyname.c rijndael.c my_aes.c sha1.c \
-			my_handler.c my_netware.c my_largepage.c \
+			my_handler.c my_largepage.c \
 			my_memmem.c stacktrace.c \
 			my_windac.c my_access.c base64.c my_libwrap.c \
 			my_rdtsc.c
diff --git a/mysys/default.c b/mysys/default.c
index fc119bb3283..8002a1a0307 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -118,7 +118,6 @@ static int search_default_file_with_ext(Process_option_func func,
   - Windows:     GetWindowsDirectory()
   - Windows:     C:/
   - Windows:     Directory above where the executable is located
-  - Netware:     sys:/etc/
   - Unix:        /etc/
   - Unix:        /etc/mysql/
   - Unix:        --sysconfdir=<path> (compile-time option)
@@ -708,7 +707,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
     strmov(name,config_file);
   }
   fn_format(name,name,"","",4);
-#if !defined(__WIN__) && !defined(__NETWARE__)
+#if !defined(__WIN__)
   {
     MY_STAT stat_info;
     if (!my_stat(name,&stat_info,MYF(0)))
@@ -954,7 +953,6 @@ static char *remove_end_comment(char *ptr)
   return ptr;
 }
 
-#include <help_start.h>
 
 void my_print_default_files(const char *conf_file)
 {
@@ -1034,8 +1032,6 @@ void print_defaults(const char *conf_file, const char **groups)
 --defaults-extra-file=# Read this file after the global files are read.");
 }
 
-#include <help_end.h>
-
 
 static int add_directory(MEM_ROOT *alloc, const char *dir, const char **dirs)
 {
@@ -1150,10 +1146,6 @@ static const char **init_default_directories(MEM_ROOT *alloc)
       errors += add_directory(alloc, fname_buffer, dirs);
   }
 
-#elif defined(__NETWARE__)
-
-  errors += add_directory(alloc, "sys:/etc/", dirs);
-
 #else
 
   errors += add_directory(alloc, "/etc/", dirs);
@@ -1172,7 +1164,7 @@ static const char **init_default_directories(MEM_ROOT *alloc)
   /* Placeholder for --defaults-extra-file=<path> */
   errors += add_directory(alloc, "", dirs);
 
-#if !defined(__WIN__) && !defined(__NETWARE__)
+#if !defined(__WIN__)
   errors += add_directory(alloc, "~/", dirs);
 #endif
 
diff --git a/mysys/mf_path.c b/mysys/mf_path.c
index d51cac732f5..92cb62e6827 100644
--- a/mysys/mf_path.c
+++ b/mysys/mf_path.c
@@ -78,9 +78,6 @@ char * my_path(char * to, const char *progname,
 #define F_OK 0
 #define PATH_SEP ';'
 #define PROGRAM_EXTENSION ".exe"
-#elif defined(__NETWARE__)
-#define PATH_SEP ';'
-#define PROGRAM_EXTENSION ".nlm"
 #else
 #define PATH_SEP ':'
 #endif
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
index 1c6c01cef9f..c84987cfc96 100644
--- a/mysys/mf_tempdir.c
+++ b/mysys/mf_tempdir.c
@@ -16,7 +16,7 @@
 #include "mysys_priv.h"
 #include <m_string.h>
 
-#if defined( __WIN__) || defined(__NETWARE__)
+#if defined(__WIN__)
 #define DELIM ';'
 #else
 #define DELIM ':'
@@ -36,7 +36,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
   {
     /* Get default temporary directory */
     pathlist=getenv("TMPDIR");	/* Use this if possible */
-#if defined( __WIN__) || defined(__NETWARE__)
+#if defined(__WIN__)
     if (!pathlist)
       pathlist=getenv("TEMP");
     if (!pathlist)
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index 40016210de4..b5933dcc317 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -109,7 +109,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
     (*free)(res);
     file=my_create(to, 0, mode | O_EXCL | O_NOFOLLOW, MyFlags);
   }
-#elif defined(HAVE_MKSTEMP) && !defined(__NETWARE__)
+#elif defined(HAVE_MKSTEMP)
   {
     char prefix_buff[30];
     uint pfx_len;
@@ -143,9 +143,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
   }
 #elif defined(HAVE_TEMPNAM)
   {
-#if !defined(__NETWARE__)
     extern char **environ;
-#endif
 
     char *res,**old_env,*temp_env[1];
     if (dir && !dir[0])
@@ -154,14 +152,14 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
       to[1]= 0;
       dir=to;
     }
-#if !defined(__NETWARE__)
+
     old_env= (char**) environ;
     if (dir)
     {				/* Don't use TMPDIR if dir is given */
       environ=(const char**) temp_env;
       temp_env[0]=0;
     }
-#endif
+
     if ((res=tempnam((char*) dir, (char*) prefix)))
     {
       strmake(to,res,FN_REFLEN-1);
@@ -176,9 +174,8 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
     {
       DBUG_PRINT("error",("Got error: %d from tempnam",errno));
     }
-#if !defined(__NETWARE__)
+
     environ=(const char**) old_env;
-#endif
   }
 #else
 #error No implementation found for create_temp_file
diff --git a/mysys/my_clock.c b/mysys/my_clock.c
index d17f26ed316..da04feb462f 100644
--- a/mysys/my_clock.c
+++ b/mysys/my_clock.c
@@ -15,14 +15,14 @@
 
 #include "my_global.h"
 
-#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__NETWARE__)
+#if !defined(_MSC_VER) && !defined(__BORLANDC__)
 #include "mysys_priv.h"
 #include <sys/times.h>
 #endif
 
 long my_clock(void)
 {
-#if !defined(__WIN__) && !defined(__NETWARE__)
+#if !defined(__WIN__)
   struct tms tmsbuf;
   (void) times(&tmsbuf);
   return (tmsbuf.tms_utime + tmsbuf.tms_stime);
diff --git a/mysys/my_copy.c b/mysys/my_copy.c
index d38507c111a..a6811694fe1 100644
--- a/mysys/my_copy.c
+++ b/mysys/my_copy.c
@@ -103,7 +103,7 @@ int my_copy(const char *from, const char *to, myf MyFlags)
     if (MyFlags & MY_HOLD_ORIGINAL_MODES && !new_file_stat)
 	DBUG_RETURN(0);			/* File copyed but not stat */
     res= chmod(to, stat_buff.st_mode & 07777); /* Copy modes */
-#if !defined(__WIN__) && !defined(__NETWARE__)
+#if !defined(__WIN__)
     res= chown(to, stat_buff.st_uid,stat_buff.st_gid); /* Copy ownership */
 #endif
 #if !defined(VMS) && !defined(__ZTC__)
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index f51dd7befd5..807e07d4f06 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -1147,8 +1147,6 @@ static uint print_name(const struct my_option *optp)
   Print help for all options and variables.
 */
 
-#include <help_start.h>
-
 void my_print_help(const struct my_option *options)
 {
   uint col, name_space= 22, comment_space= 57;
@@ -1330,5 +1328,3 @@ void my_print_variables(const struct my_option *options)
     }
   }
 }
-
-#include <help_end.h>
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c
index ea12f73fe3d..cc5d1b83efb 100644
--- a/mysys/my_getsystime.c
+++ b/mysys/my_getsystime.c
@@ -25,10 +25,6 @@
 #include "mysys_priv.h"
 #include "my_static.h"
 
-#ifdef __NETWARE__
-#include <nks/time.h>
-#endif
-
 ulonglong my_getsystime()
 {
 #ifdef HAVE_CLOCK_GETTIME
@@ -45,10 +41,6 @@ ulonglong my_getsystime()
              query_performance_frequency) + query_performance_offset);
   }
   return 0;
-#elif defined(__NETWARE__)
-  NXTime_t tm;
-  NXGetTime(NX_SINCE_1970, NX_NSECONDS, &tm);
-  return (ulonglong)tm/100;
 #else
   /* TODO: check for other possibilities for hi-res timestamping */
   struct timeval tv;
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 41a2efe0b90..06f4fa2b6a5 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -36,11 +36,6 @@ static my_bool win32_init_tcp_ip();
 #else
 #define my_win_init()
 #endif
-#ifdef __NETWARE__
-static void netware_init();
-#else
-#define netware_init()
-#endif
 
 my_bool my_init_done= 0;
 /** True if @c my_basic_init() has been called. */
@@ -109,7 +104,6 @@ my_bool my_basic_init(void)
 #if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
   fastmutex_global_init();              /* Must be called early */
 #endif
-  netware_init();
 #ifdef THREAD
 #if defined(HAVE_PTHREAD_INIT)
   pthread_init();			/* Must be called before DBUG_ENTER */
@@ -150,7 +144,7 @@ my_bool my_init(void)
 #ifdef THREAD
   if (my_thread_global_init())
     return 1;
-#if !defined( __WIN__) && !defined(__NETWARE__)
+#if !defined(__WIN__)
   sigfillset(&my_signals);		/* signals blocked by mf_brkhant */
 #endif
 #endif /* THREAD */
@@ -239,9 +233,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
 	      rus.ru_msgsnd, rus.ru_msgrcv, rus.ru_nsignals,
 	      rus.ru_nvcsw, rus.ru_nivcsw);
 #endif
-#if defined(__NETWARE__) && !defined(__WIN__)
-    fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC);
-#endif
 #if defined(__WIN__) && defined(_MSC_VER)
    _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
    _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR );
@@ -524,60 +515,6 @@ static my_bool win32_init_tcp_ip()
 }
 #endif /* __WIN__ */
 
-
-#ifdef __NETWARE__
-/*
-  Basic initialisation for netware
-*/
-
-static void netware_init()
-{
-  char cwd[PATH_MAX], *name;
-
-  DBUG_ENTER("netware_init");
-
-  /* init only if we are not a client library */
-  if (my_progname)
-  {
-#if SUPPORTED_BY_LIBC   /* Removed until supported in Libc */
-    struct termios tp;
-    /* Disable control characters */
-    tcgetattr(STDIN_FILENO, &tp);
-    tp.c_cc[VINTR] = _POSIX_VDISABLE;
-    tp.c_cc[VEOF] = _POSIX_VDISABLE;
-    tp.c_cc[VSUSP] = _POSIX_VDISABLE;
-    tcsetattr(STDIN_FILENO, TCSANOW, &tp);
-#endif /* SUPPORTED_BY_LIBC */
-
-    /* With stdout redirection */
-    if (!isatty(STDOUT_FILENO))
-    {
-      setscreenmode(SCR_AUTOCLOSE_ON_EXIT);      /* auto close the screen */
-    }
-    else
-    {
-      setscreenmode(SCR_NO_MODE);		/* keep the screen up */
-    }
-
-    /* Parse program name and change to base format */
-    name= (char*) my_progname;
-    for (; *name; name++)
-    {
-      if (*name == '\\')
-      {
-        *name = '/';
-      }
-      else
-      {
-        *name = tolower(*name);
-      }
-    }
-  }
-
-  DBUG_VOID_RETURN;
-}
-#endif /* __NETWARE__ */
-
 #ifdef HAVE_PSI_INTERFACE
 
 #if !defined(HAVE_PREAD) && !defined(_WIN32)
diff --git a/mysys/my_lock.c b/mysys/my_lock.c
index 1436c845286..8a28c7390c4 100644
--- a/mysys/my_lock.c
+++ b/mysys/my_lock.c
@@ -22,9 +22,6 @@
 #undef NO_ALARM_LOOP
 #endif
 #include <my_alarm.h>
-#ifdef __NETWARE__
-#include <nks/fsio.h>
-#endif
 
 #ifdef _WIN32
 #define WIN_LOCK_INFINITE -1
@@ -145,9 +142,6 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
   int value;
   ALARM_VARIABLES;
 #endif
-#ifdef __NETWARE__
-  int nxErrno;
-#endif
 
   DBUG_ENTER("my_lock");
   DBUG_PRINT("my",("fd: %d  Op: %d  start: %ld  Length: %ld  MyFlags: %d",
@@ -158,47 +152,7 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
   if (my_disable_locking)
     DBUG_RETURN(0);
 
-#if defined(__NETWARE__)
-  {
-    NXSOffset_t nxLength = length;
-    unsigned long nxLockFlags = 0;
-
-    if (length == F_TO_EOF)
-    {
-      /* EOF is interpreted as a very large length. */
-      nxLength = 0x7FFFFFFFFFFFFFFF;
-    }
-
-    if (locktype == F_UNLCK)
-    {
-      /* The lock flags are currently ignored by NKS. */
-      if (!(nxErrno= NXFileRangeUnlock(fd, 0L, start, nxLength)))
-        DBUG_RETURN(0);
-    }
-    else
-    {
-      if (locktype == F_RDLCK)
-      {
-        /* A read lock is mapped to a shared lock. */
-        nxLockFlags = NX_RANGE_LOCK_SHARED;
-      }
-      else
-      {
-        /* A write lock is mapped to an exclusive lock. */
-        nxLockFlags = NX_RANGE_LOCK_EXCL;
-      }
-
-      if (MyFlags & MY_DONT_WAIT)
-      {
-        /* Don't block on the lock. */
-        nxLockFlags |= NX_RANGE_LOCK_TRYLOCK;
-      }
-
-      if (!(nxErrno= NXFileRangeLock(fd, nxLockFlags, start, nxLength)))
-        DBUG_RETURN(0);
-    }
-  }
-#elif defined(_WIN32)
+#if defined(_WIN32)
   {
     int timeout_sec;
     if (MyFlags & MY_DONT_WAIT)
@@ -257,12 +211,9 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
 #endif /* HAVE_FCNTL */
 #endif /* HAVE_LOCKING */
 
-#ifdef __NETWARE__
-  my_errno = nxErrno;
-#else
-	/* We got an error. We don't want EACCES errors */
+  /* We got an error. We don't want EACCES errors */
   my_errno=(errno == EACCES) ? EAGAIN : errno ? errno : -1;
-#endif
+
   if (MyFlags & MY_WME)
   {
     if (locktype == F_UNLCK)
diff --git a/mysys/my_mess.c b/mysys/my_mess.c
index 0ec97525ae8..513afe39054 100644
--- a/mysys/my_mess.c
+++ b/mysys/my_mess.c
@@ -22,11 +22,7 @@ void my_message_stderr(uint error __attribute__((unused)),
   DBUG_PRINT("enter",("message: %s",str));
   (void) fflush(stdout);
   if (MyFlags & ME_BELL)
-#ifdef __NETWARE__
-    ringbell();                   				/* Bell */
-#else
-    (void) fputc('\007',stderr);				/* Bell */
-#endif /* __NETWARE__ */
+    (void) fputc('\007', stderr);
   if (my_progname)
   {
     (void)fputs(my_progname,stderr); (void)fputs(": ",stderr);
diff --git a/mysys/my_netware.c b/mysys/my_netware.c
deleted file mode 100644
index 5b5c39c0ac0..00000000000
--- a/mysys/my_netware.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*
-  Functions specific to netware
-*/
-
-#include <mysys_priv.h>
-#ifdef __NETWARE__
-  #include <string.h>
-  #include <library.h>
-
-/*
-  PMUserLicenseRequest is an API exported by the polimgr.nlm
-  (loaded by the NetWare OS when it comes up) for use by other
-  NLM-based NetWare products/services.
-  PMUserLicenseRequest provides a couple of functions:
-  1) it will optionally request a User license or ensure that
-  one already exists for the specified User in userInfo
-  2) it utilizes the NetWare usage metering service to
-  record usage information about your product/service.
-*/
-
-long PMMeteredUsageRequest
-(
- /*
-   NDS distinguished name or IP address or ??.  asciiz string, e.g.
-   ".CN=Admin.O=this.T=MYTREE."
- */
- char *userInfo,
- long infoType,                /* see defined values */
- /*
-   string used to identify the calling service, used to index the
-   metered info e.g. "iPrint"
- */
- char *serviceID,
- char tranAddrType,            /* type of address that follows */
- char *tranAddr,               /* ptr to a 10-byte array */
- long flags,                   /* see defined values */
- /* NLS error code, if any.  NULL input is okay */
- long *licRequestErrCode,
- /*  meter service error code, if any.  NULL input is okay */
- long *storeMeterInfoErrCode,
- /*
-   error code from NLSMeter if
-   storeMeterInfoErrCode == PM_LICREQ_NLSMETERERROR.
-   NULL input is okay
- */
- long *NLSMeterErrCode
-);
-
-typedef long(*PMUR)(const char*, long, const char*, char,
-        const char*, long, long*, long*, long*);
-
-/* infoType */
-/* indicates that the info in the userInfo param is an NDS user */
-#define PM_USERINFO_TYPE_NDS      1
-/* indicates that the info in the userInfo param is NOT an NDS user */
-#define PM_USERINFO_TYPE_ADDRESS  2
-
-/* Flags */
-
-/*
-  Tells the service that it should not check to see if the NDS user
-  contained in the userInfo param has a NetWare User License - just
-  record metering information; this is ignored if infoType !=
-  PM_USERINFO_TYPE_NDS
-*/
-
-#define PM_FLAGS_METER_ONLY         0x0000001
-
-/*
-  Indicates that the values in the userInfo and serviceID parameters
-  are unicode strings, so that the metering service bypasses
-  converting these to unicode (again)
-*/
-#define PM_LICREQ_ALREADY_UNICODE   0x0000002
-/*
-  Useful only if infoType is PM_USERINFO_TYPE_NDS - indicates a "no
-  stop" policy of the calling service
-*/
-#define PM_LICREQ_ALWAYS_METER      0x0000004
-
-
-/*
-  net Address Types - system-defined types of net addresses that can
-  be used in the tranAddrType field
-*/
-
-#define NLS_TRAN_TYPE_IPX     0x00000001    /* An IPX address */
-#define NLS_TRAN_TYPE_IP      0x00000008    /* An IP address */
-#define NLS_ADDR_TYPE_MAC     0x000000F1    /* a MAC address */
-
-/*
-  Net Address Sizes - lengths that correspond to the tranAddrType
-  field (just fyi)
-*/
-#define NLS_IPX_ADDR_SIZE   10    /* the size of an IPX address */
-#define NLS_IP_ADDR_SIZE    4     /* the size of an IP address */
-#define NLS_MAC_ADDR_SIZE   6     /* the size of a MAC address */
-
-
-void netware_reg_user(const char *ip, const char *user,
-		      const char *application)
-{
-  PMUR usage_request;
-  long licRequestErrCode      = 0;
-  long storeMeterInfoErrCode  = 0;
-  long nlsMeterErrCode        = 0;
-
-  /* import the symbol */
-  usage_request= ((PMUR)ImportPublicObject(getnlmhandle(),
-					   "PMMeteredUsageRequest"));
-  if (usage_request != NULL)
-  {
-    unsigned long iaddr;
-    char addr[NLS_IPX_ADDR_SIZE];
-
-    /* create address */
-    iaddr = htonl(inet_addr(ip));
-    bzero(addr, NLS_IPX_ADDR_SIZE);
-    memcpy(addr, &iaddr, NLS_IP_ADDR_SIZE);
-
-    /* call to NLS */
-    usage_request(user,
-		  PM_USERINFO_TYPE_ADDRESS,
-		  application,
-		  NLS_TRAN_TYPE_IP,
-		  addr,
-		  PM_FLAGS_METER_ONLY,
-		  &licRequestErrCode,
-		  &storeMeterInfoErrCode,
-		  &nlsMeterErrCode);
-    /* release symbol */
-    UnImportPublicObject(getnlmhandle(), "PMMeteredUsageRequest");
-  }
-}
-#endif /* __NETWARE__ */
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 3019e4bc5c1..270d13928e3 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -45,34 +45,6 @@ void *my_pthread_getspecific_imp(pthread_key_t key)
 }
 #endif
 
-#ifdef __NETWARE__
-/*
-  Don't kill the LibC Reaper thread or the main thread
-*/
-#include <nks/thread.h>
-#undef pthread_exit
-void my_pthread_exit(void *status)
-{
-  NXThreadId_t tid;
-  NXContext_t ctx;
-  char name[NX_MAX_OBJECT_NAME_LEN+1] = "";
-
-  tid= NXThreadGetId();
-  if (tid == NX_INVALID_THREAD_ID || !tid)
-    return;
-  if (NXThreadGetContext(tid, &ctx) ||
-      NXContextGetName(ctx, name, sizeof(name)-1))
-    return;
-
-  /*
-    "MYSQLD.NLM's LibC Reaper" or "MYSQLD.NLM's main thread"
-    with a debug build of LibC the reaper can have different names
-  */
-  if (!strindex(name, "\'s"))
-    pthread_exit(status);
-}
-#endif
-
 /*
   Some functions for RTS threads, AIX, Siemens Unix and UnixWare 7
   (and DEC OSF/1 3.2 too)
diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c
index 073663e3d96..c8ef38efbdc 100644
--- a/mysys/my_rdtsc.c
+++ b/mysys/my_rdtsc.c
@@ -86,10 +86,6 @@
 #include <sys/times.h>       /* for times */
 #endif
 
-#if defined(__NETWARE__)
-#include <nks/time.h>        /* for NXGetTime */
-#endif
-
 #if defined(__INTEL_COMPILER) && defined(__ia64__) && defined(HAVE_IA64INTRIN_H)
 #include <ia64intrin.h>    /* for __GetReg */
 #endif
@@ -265,12 +261,6 @@ ulonglong my_timer_nanoseconds(void)
     clock_gettime(CLOCK_REALTIME, &tp);
     return (ulonglong) tp.tv_sec * 1000000000 + (ulonglong) tp.tv_nsec;
   }
-#elif defined(__NETWARE__)
-  {
-    NXTime_t tm;
-    NXGetTime(NX_SINCE_1970, NX_NSECONDS, &tm);
-    return (ulonglong) tm;
-  }
 #elif defined(__APPLE__) && defined(__MACH__)
   {
     ulonglong tm;
@@ -322,12 +312,6 @@ ulonglong my_timer_microseconds(void)
     QueryPerformanceCounter(&t_cnt);
     return (ulonglong) t_cnt.QuadPart;
   }
-#elif defined(__NETWARE__)
-  {
-    NXTime_t tm;
-    NXGetTime(NX_SINCE_1970, NX_USECONDS, &tm);
-    return (ulonglong) tm;
-  }
 #else
   return 0;
 #endif
@@ -354,12 +338,6 @@ ulonglong my_timer_milliseconds(void)
    GetSystemTimeAsFileTime( &ft );
    return ((ulonglong)ft.dwLowDateTime +
                   (((ulonglong)ft.dwHighDateTime) << 32))/10000;
-#elif defined(__NETWARE__)
-  {
-    NXTime_t tm;
-    NXGetTime(NX_SINCE_1970, NX_MSECONDS, &tm);
-    return (ulonglong)tm;
-  }
 #else
   return 0;
 #endif
@@ -378,12 +356,6 @@ ulonglong my_timer_ticks(void)
     struct tms times_buf;
     return (ulonglong) times(&times_buf);
   }
-#elif defined(__NETWARE__)
-  {
-    NXTime_t tm;
-    NXGetTime(NX_SINCE_BOOT, NX_TICKS, &tm);
-    return (ulonglong) tm;
-  }
 #elif defined(_WIN32)
   return (ulonglong) GetTickCount();
 #else
@@ -583,8 +555,6 @@ void my_timer_init(MY_TIMER_INFO *mti)
   mti->nanoseconds.routine= MY_TIMER_ROUTINE_GETHRTIME;
 #elif defined(HAVE_CLOCK_GETTIME)
   mti->nanoseconds.routine= MY_TIMER_ROUTINE_CLOCK_GETTIME;
-#elif defined(__NETWARE__)
-  mti->nanoseconds.routine= MY_TIMER_ROUTINE_NXGETTIME;
 #elif defined(__APPLE__) && defined(__MACH__)
   mti->nanoseconds.routine= MY_TIMER_ROUTINE_MACH_ABSOLUTE_TIME;
 #else
@@ -614,8 +584,6 @@ void my_timer_init(MY_TIMER_INFO *mti)
       mti->microseconds.routine= MY_TIMER_ROUTINE_QUERYPERFORMANCECOUNTER;
     }
   }
-#elif defined(__NETWARE__)
-  mti->microseconds.routine= MY_TIMER_ROUTINE_NXGETTIME;
 #else
   mti->microseconds.routine= 0;
 #endif
@@ -633,8 +601,6 @@ void my_timer_init(MY_TIMER_INFO *mti)
   mti->milliseconds.routine= MY_TIMER_ROUTINE_FTIME;
 #elif defined(_WIN32)
   mti->milliseconds.routine= MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME;
-#elif defined(__NETWARE__)
-  mti->milliseconds.routine= MY_TIMER_ROUTINE_NXGETTIME;
 #elif defined(HAVE_TIME)
   mti->milliseconds.routine= MY_TIMER_ROUTINE_TIME;
 #else
@@ -652,8 +618,6 @@ void my_timer_init(MY_TIMER_INFO *mti)
   mti->ticks.frequency= 100; /* permanent assumption */
 #if defined(HAVE_SYS_TIMES_H) && defined(HAVE_TIMES)
   mti->ticks.routine= MY_TIMER_ROUTINE_TIMES;
-#elif defined(__NETWARE__)
-  mti->ticks.routine= MY_TIMER_ROUTINE_NXGETTIME;
 #elif defined(_WIN32)
   mti->ticks.routine= MY_TIMER_ROUTINE_GETTICKCOUNT;
 #else
@@ -998,7 +962,7 @@ void my_timer_init(MY_TIMER_INFO *mti)
 
    We tested with AIX, Solaris (x86 + Sparc), Linux (x86 +
    Itanium), Windows, 64-bit Windows, QNX, FreeBSD, HPUX,
-   Irix, Mac. We didn't test with NetWare or SCO.
+   Irix, Mac. We didn't test with SCO.
 
 */
 
diff --git a/mysys/my_redel.c b/mysys/my_redel.c
index 77040870048..515e5cab1eb 100644
--- a/mysys/my_redel.c
+++ b/mysys/my_redel.c
@@ -76,7 +76,7 @@ end:
 int my_copystat(const char *from, const char *to, int MyFlags)
 {
   struct stat statbuf;
-#if !defined(__WIN__) && !defined(__NETWARE__)
+#if !defined(__WIN__)
   int res;
 #endif
 
@@ -91,14 +91,14 @@ int my_copystat(const char *from, const char *to, int MyFlags)
     return 1;
   (void) chmod(to, statbuf.st_mode & 07777);		/* Copy modes */
 
-#if !defined(__WIN__) && !defined(__NETWARE__)
+#if !defined(__WIN__)
   if (statbuf.st_nlink > 1 && MyFlags & MY_LINK_WARNING)
   {
     if (MyFlags & MY_LINK_WARNING)
       my_error(EE_LINK_WARNING,MYF(ME_BELL+ME_WAITTANG),from,statbuf.st_nlink);
   }
   res= chown(to, statbuf.st_uid, statbuf.st_gid);	/* Copy ownership */
-#endif /* !__WIN__ && !__NETWARE__ */
+#endif /* !__WIN__ */
 
 #ifndef VMS
 #ifndef __ZTC__
diff --git a/mysys/my_rename.c b/mysys/my_rename.c
index 39e6056a9e4..1a4e7b2b409 100644
--- a/mysys/my_rename.c
+++ b/mysys/my_rename.c
@@ -44,7 +44,7 @@ int my_rename(const char *from, const char *to, myf MyFlags)
   }
 #endif
 #if defined(HAVE_RENAME)
-#if defined(__WIN__) || defined(__NETWARE__)
+#if defined(__WIN__)
   /*
     On windows we can't rename over an existing file:
     Remove any conflicting files:
diff --git a/mysys/my_sleep.c b/mysys/my_sleep.c
index 87170e4af41..6d1bdd5dc55 100644
--- a/mysys/my_sleep.c
+++ b/mysys/my_sleep.c
@@ -20,9 +20,7 @@
 
 void my_sleep(ulong m_seconds)
 {
-#ifdef __NETWARE__
-  delay(m_seconds/1000+1);
-#elif defined(__WIN__)
+#if defined(__WIN__)
   Sleep(m_seconds/1000+1);      /* Sleep() has millisecond arg */
 #elif defined(HAVE_SELECT)
   struct timeval t;