Merge of mysql-trunk-bugfixing into mysql-trunk-merge.

1 files changed, 0 insertions, 28 deletions

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)