bk commit into 5.0 tree (1.1547)

Below is the list of changes that have just been committed into a local
5.0 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.1547 03/04/25 13:49:18 rlyon@xxxxxxxxxx +4 -0
  Pulled from MySQL 4.1

  sql/slave.cc
    1.192 03/04/25 13:49:13 rlyon@xxxxxxxxxx +0 -4
    Pulled from MySQL 4.1

  sql/mysqld.cc
    1.360 03/04/25 13:49:13 rlyon@xxxxxxxxxx +4 -5
    Pulled from MySQL 4.1

  mysys/my_pthread.c
    1.37 03/04/25 13:49:13 rlyon@xxxxxxxxxx +23 -0
    Pulled from MySQL 4.1

  include/my_pthread.h
    1.65 03/04/25 13:49:13 rlyon@xxxxxxxxxx +5 -0
    Pulled from MySQL 4.1

# 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-5.0

--- 1.64/include/my_pthread.h   Thu Apr  3 03:47:37 2003
+++ 1.65/include/my_pthread.h   Fri Apr 25 13:49:13 2003
@@ -248,6 +248,11 @@
 #error Requires at least rev 2 of EMX pthreads library.
 #endif
 
+#ifdef __NETWARE__
+void my_pthread_exit(void *status);
+#define pthread_exit(A) my_pthread_exit(A)
+#endif
+
 extern int my_pthread_getprio(pthread_t thread_id);
 
 #define pthread_key(T,V) pthread_key_t V

--- 1.36/mysys/my_pthread.c     Thu Apr  3 03:47:37 2003
+++ 1.37/mysys/my_pthread.c     Fri Apr 25 13:49:13 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) */

--- 1.359/sql/mysqld.cc Wed Apr 16 16:26:29 2003
+++ 1.360/sql/mysqld.cc Fri Apr 25 13:49:13 2003
@@ -824,11 +824,12 @@
     unireg_abort(1);                           /* purecov: inspected */
   else
     unireg_end();
+
 #ifdef __NETWARE__
   pthread_join(select_thread, NULL);           // wait for main thread
-#else
-  pthread_exit(0);                             /* purecov: deadcode */
 #endif /* __NETWARE__ */
+  
+  pthread_exit(0);                             /* purecov: deadcode */
 
 #endif /* EMBEDDED_LIBRARY */
   RETURN_FROM_KILL_SERVER;
@@ -886,13 +887,11 @@
 {
   clean_up(1);
   my_thread_end();
-#ifndef __NETWARE__
-#ifdef SIGNALS_DONT_BREAK_READ
+#if defined(SIGNALS_DONT_BREAK_READ) && !defined(__NETWARE__)
   exit(0);
 #else
   pthread_exit(0);                             // Exit is in main thread
 #endif
-#endif /* __NETWARE__ */
 }
 
 

--- 1.191/sql/slave.cc  Tue Apr  8 08:28:34 2003
+++ 1.192/sql/slave.cc  Fri Apr 25 13:49:13 2003
@@ -2437,9 +2437,7 @@
     goto slave_begin;
 #endif  
   my_thread_end();
-#ifndef __NETWARE__
   pthread_exit(0);
-#endif /* __NETWARE__ */
   DBUG_RETURN(0);                              // Can't return anything here
 }
 
@@ -2583,9 +2581,7 @@
     goto slave_begin;
 #endif  
   my_thread_end();
-#ifndef __NETWARE__
   pthread_exit(0);
-#endif /* __NETWARE__ */
   DBUG_RETURN(0);                              // Can't return anything here
 }
 

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