bk commit into 4.0 tree (1.1475)

Below is the list of changes that have just been committed into a local
4.0 repository of greg. When greg 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.1475 03/04/24 20:48:54 greg@xxxxxxxxx +7 -0
  Changes from Novell for NetWare platform

  sql/sql_load.cc
    1.46 03/04/24 20:48:52 greg@xxxxxxxxx +1 -1
    Stat properites should not be checked here on NetWare.

  sql/slave.cc
    1.219 03/04/24 20:48:52 greg@xxxxxxxxx +0 -4
    Consolidated NetWare pthread_exit() changes.

  sql/mysqld.cc
    1.418 03/04/24 20:48:52 greg@xxxxxxxxx +3 -5
    Consolidated NetWare pthread_exit() changes.

  sql/mini_client.cc
    1.51 03/04/24 20:48:52 greg@xxxxxxxxx +1 -1
    Modified to match my_connect().

  mysys/my_pthread.c
    1.36 03/04/24 20:48:52 greg@xxxxxxxxx +23 -0
    Consolidated NetWare pthread_exit() changes.

  mysys/mf_path.c
    1.9 03/04/24 20:48:52 greg@xxxxxxxxx +3 -0
    NetWare needs a semicolon path delimiter.

  include/my_pthread.h
    1.62 03/04/24 20:48:52 greg@xxxxxxxxx +5 -0
    Consolidated NetWare pthread_exit() changes.

# 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: greg
# Host: gcw.(none)
# Root: /home/greg/bk/mysql-4.0

--- 1.61/include/my_pthread.h   Fri Mar 21 16:45:37 2003
+++ 1.62/include/my_pthread.h   Thu Apr 24 20:48:52 2003
@@ -247,6 +247,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.8/mysys/mf_path.c Thu Dec  6 07:10:41 2001
+++ 1.9/mysys/mf_path.c Thu Apr 24 20:48:52 2003
@@ -77,6 +77,9 @@
 #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

--- 1.35/mysys/my_pthread.c     Fri Mar 21 16:45:38 2003
+++ 1.36/mysys/my_pthread.c     Thu Apr 24 20:48:52 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.50/sql/mini_client.cc     Sun Jan  5 13:18:47 2003
+++ 1.51/sql/mini_client.cc     Thu Apr 24 20:48:52 2003
@@ -243,7 +243,7 @@
 static int mc_sock_connect(my_socket s, const struct sockaddr *name,
                           uint namelen, uint to)
 {
-#if defined(__WIN__) || defined(OS2)
+#if defined(__WIN__) || defined(OS2) || defined(__NETWARE__)
   return connect(s, (struct sockaddr*) name, namelen);
 #else
   int flags, res, s_err;

--- 1.417/sql/mysqld.cc Wed Apr 23 17:09:42 2003
+++ 1.418/sql/mysqld.cc Thu Apr 24 20:48:52 2003
@@ -797,9 +797,9 @@
 
 #ifdef __NETWARE__
   pthread_join(select_thread, NULL);           // wait for main thread
-#else
-  pthread_exit(0);                             /* purecov: deadcode */
 #endif /* __NETWARE__ */
+  
+  pthread_exit(0);                             /* purecov: deadcode */
 
   RETURN_FROM_KILL_SERVER;
 }
@@ -856,13 +856,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.218/sql/slave.cc  Thu Apr  3 04:33:12 2003
+++ 1.219/sql/slave.cc  Thu Apr 24 20:48:52 2003
@@ -2355,9 +2355,7 @@
     goto slave_begin;
 #endif  
   my_thread_end();
-#ifndef __NETWARE__
   pthread_exit(0);
-#endif /* __NETWARE__ */
   DBUG_RETURN(0);                              // Can't return anything here
 }
 
@@ -2500,9 +2498,7 @@
     goto slave_begin;
 #endif  
   my_thread_end(); // clean-up before broadcasting termination
-#ifndef __NETWARE__
   pthread_exit(0);
-#endif /* __NETWARE__ */
   DBUG_RETURN(0);                              // Can't return anything here
 }
 

--- 1.45/sql/sql_load.cc        Wed Feb 26 17:06:08 2003
+++ 1.46/sql/sql_load.cc        Thu Apr 24 20:48:52 2003
@@ -179,7 +179,7 @@
     else
     {
       unpack_filename(name,ex->file_name);
-#if !defined(__WIN__) && !defined(OS2)
+#if !defined(__WIN__) && !defined(OS2) && ! defined(__NETWARE__)
       MY_STAT stat_info;
       if (!my_stat(name,&stat_info,MYF(MY_WME)))
        DBUG_RETURN(-1);

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