bk commit into 4.1 tree (1.1527)

Below is the list of changes that have just been committed into a local
4.1 repository of rlyon. When rlyon does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1527 03/04/25 13:44:52 rlyon@xxxxxxxxxx +2 -0
  Moved forward from MySQL 4.0

  mysys/my_pthread.c
    1.37 03/04/25 13:44:48 rlyon@xxxxxxxxxx +23 -0
    Moved forward from MySQL 4.0

  include/my_pthread.h
    1.66 03/04/25 13:44:48 rlyon@xxxxxxxxxx +2 -1
    Moved forward from MySQL 4.0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: rlyon
# Host: rlyon4.provo.novell.com
# Root: /home/rlyon/bk/mysql-4.1

--- 1.65/include/my_pthread.h   Thu Apr  3 17:15:00 2003
+++ 1.66/include/my_pthread.h   Fri Apr 25 13:44:48 2003
@@ -249,7 +249,8 @@
 #endif
 
 #ifdef __NETWARE__
-#define pthread_exit(A) (A)
+void my_pthread_exit(void *status);
+#define pthread_exit(A) my_pthread_exit(A)
 #endif
 
 extern int my_pthread_getprio(pthread_t thread_id);

--- 1.36/mysys/my_pthread.c     Thu Apr  3 03:47:37 2003
+++ 1.37/mysys/my_pthread.c     Fri Apr 25 13:44:48 2003
@@ -90,6 +90,29 @@
 }
 #endif
 
+#ifdef __NETWARE__
+/*
+don't kill the LibC Reaper thread or the main thread
+*/
+#include <nks/thread.h>
+void my_pthread_exit(void *status)
+{
+#undef pthread_exit
+  NXThreadId_t tid = NXThreadGetId();
+  NXContext_t ctx;
+  char name[PATH_MAX] = "";
+
+  NXThreadGetContext(tid, &ctx);
+  NXContextGetName(ctx, name, PATH_MAX);
+
+  // "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) */

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx