bk commit into 5.1 tree (brian:1.2364)

[Brian Aker]

Below is the list of changes that have just been committed into a local
5.1 repository of brian. When brian 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2364 06/04/17 13:05:19 brian@zim.(none) +7 -0
  UNIXWARE removal

  mysys/my_pthread.c
    1.46 06/04/17 13:05:14 brian@zim.(none) +1 -4
    UNIXWare removal

  mysys/my_init.c
    1.48 06/04/17 13:05:14 brian@zim.(none) +0 -3
    UNIXWare removal

  include/my_pthread.h
    1.95 06/04/17 13:05:14 brian@zim.(none) +0 -62
    UNIXWare removal

  include/my_no_pthread.h
    1.9 06/04/17 13:05:13 brian@zim.(none) +0 -4
    UNIXWare removal

  include/my_global.h
    1.130 06/04/17 13:05:13 brian@zim.(none) +0 -5
    UNIXWare removal.

  include/m_string.h
    1.41 06/04/17 13:05:13 brian@zim.(none) +0 -13
    UNIXWare removal

  extra/resolveip.c
    1.25 06/04/17 13:05:13 brian@zim.(none) +1 -1
    UNIXWARE removal

# 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:	brian
# Host:	zim.(none)
# Root:	/home/brian/mysql/dep-5.1

--- 1.24/extra/resolveip.c	2004-08-31 17:23:28 -07:00
+++ 1.25/extra/resolveip.c	2006-04-17 13:05:13 -07:00
@@ -32,7 +32,7 @@
 #include <my_net.h>
 #include <my_getopt.h>
 
-#if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) &&
!defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno)
+#if !defined(_AIX) && !defined(h_errno)
 extern int h_errno;
 #endif
 

--- 1.40/include/m_string.h	2006-04-16 03:38:46 -07:00
+++ 1.41/include/m_string.h	2006-04-17 13:05:13 -07:00
@@ -34,19 +34,6 @@
 /* need by my_vsnprintf */
 #include <stdarg.h> 
 
-/* Correct some things for UNIXWARE7 */
-#ifdef HAVE_UNIXWARE7_THREADS
-#undef HAVE_STRINGS_H
-#undef HAVE_MEMORY_H
-#define HAVE_MEMCPY
-#ifndef HAVE_MEMMOVE
-#define HAVE_MEMMOVE
-#endif
-#undef HAVE_BCMP
-#undef bcopy
-#undef bcmp
-#undef bzero
-#endif /* HAVE_UNIXWARE7_THREADS */
 #ifdef _AIX
 #undef HAVE_BCMP
 #endif

--- 1.8/include/my_no_pthread.h	2006-04-15 08:48:53 -07:00
+++ 1.9/include/my_no_pthread.h	2006-04-17 13:05:13 -07:00
@@ -27,10 +27,6 @@
   Case in point: 'mf_keycache.c'
 */
 #if defined(__WIN__)
-
-#elif defined(HAVE_UNIXWARE7_THREADS)
-/* #include <thread.h>   Currently, not relevant. Enable if needed. */
-
 #else /* Normal threads */
 #include <pthread.h>
 

--- 1.94/include/my_pthread.h	2006-04-16 01:50:20 -07:00
+++ 1.95/include/my_pthread.h	2006-04-17 13:05:14 -07:00
@@ -142,68 +142,6 @@
 /*#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) */
 #define my_pthread_getprio(thread_id) pthread_dummy(0)
 
-#elif defined(HAVE_UNIXWARE7_THREADS)
-
-#include <thread.h>
-#include <synch.h>
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-
-#define HAVE_NONPOSIX_SIGWAIT
-#define pthread_t thread_t
-#define pthread_cond_t cond_t
-#define pthread_mutex_t mutex_t
-#define pthread_key_t thread_key_t
-typedef int pthread_attr_t;			/* Needed by Unixware 7.0.0 */
-
-#define pthread_key_create(A,B) thr_keycreate((A),(B))
-#define pthread_key_delete(A) thr_keydelete(A)
-
-#define pthread_handler_t EXTERNC void *
-#define pthread_key(T,V) pthread_key_t V
-
-void *	my_pthread_getspecific_imp(pthread_key_t key);
-#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
-#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,V)
-
-#define pthread_setspecific(A,B) thr_setspecific(A,B)
-#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,V)
-
-#define pthread_create(A,B,C,D) thr_create(NULL,65536L,(C),(D),THR_DETACHED,(A))
-#define pthread_cond_init(a,b) cond_init((a),USYNC_THREAD,NULL)
-#define pthread_cond_destroy(a) cond_destroy(a)
-#define pthread_cond_signal(a) cond_signal(a)
-#define pthread_cond_wait(a,b) cond_wait((a),(b))
-#define pthread_cond_timedwait(a,b,c) cond_timedwait((a),(b),(c))
-#define pthread_cond_broadcast(a) cond_broadcast(a)
-
-#define pthread_mutex_init(a,b) mutex_init((a),USYNC_THREAD,NULL)
-#define pthread_mutex_lock(a) mutex_lock(a)
-#define pthread_mutex_unlock(a) mutex_unlock(a)
-#define pthread_mutex_destroy(a) mutex_destroy(a)
-
-#define pthread_self() thr_self()
-#define pthread_exit(A) thr_exit(A)
-#define pthread_equal(A,B) (((A) == (B)) ? 1 : 0)
-#define pthread_kill(A,B) thr_kill((A),(B))
-#define HAVE_PTHREAD_KILL
-
-#define pthread_sigmask(A,B,C) thr_sigsetmask((A),(B),(C))
-
-extern int my_sigwait(const sigset_t *set,int *sig);
-
-#define pthread_detach_this_thread() pthread_dummy(0)
-
-#define pthread_attr_init(A) pthread_dummy(0)
-#define pthread_attr_destroy(A) pthread_dummy(0)
-#define pthread_attr_setscope(A,B) pthread_dummy(0)
-#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
-#define my_pthread_setprio(A,B) pthread_dummy (0)
-#define my_pthread_getprio(A) pthread_dummy (0)
-#define my_pthread_attr_setprio(A,B) pthread_dummy(0)
-
 #else /* Normal threads */
 
 #ifdef HAVE_rts_threads

--- 1.47/mysys/my_init.c	2006-04-15 08:48:54 -07:00
+++ 1.48/mysys/my_init.c	2006-04-17 13:05:14 -07:00
@@ -91,9 +91,6 @@
   sigfillset(&my_signals);		/* signals blocked by mf_brkhant */
 #endif
 #endif /* THREAD */
-#ifdef UNIXWARE_7
-  (void) isatty(0);			/* Go around connect() bug in UW7 */
-#endif
   {
     DBUG_ENTER("my_init");
     DBUG_PROCESS((char*) (my_progname ? my_progname : "unknown"));

--- 1.45/mysys/my_pthread.c	2006-04-16 01:50:20 -07:00
+++ 1.46/mysys/my_pthread.c	2006-04-17 13:05:14 -07:00
@@ -76,9 +76,6 @@
 
 #ifdef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC
 #undef pthread_getspecific
-#ifdef HAVE_UNIXWARE7_THREADS
-#define pthread_getspecific thr_getspecific
-#endif
 
 void *my_pthread_getspecific_imp(pthread_key_t key)
 {
@@ -429,7 +426,7 @@
 ** Patches for AIX and DEC OSF/1 3.2
 *****************************************************************************/
 
-#if (defined(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT) &&
!defined(HAVE_UNIXWARE7_THREADS)) || defined(HAVE_DEC_3_2_THREADS)
+#if defined(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT)
 
 #include <netdb.h>
 

--- 1.129/include/my_global.h	2006-04-16 22:10:51 -07:00
+++ 1.130/include/my_global.h	2006-04-17 13:05:13 -07:00
@@ -208,7 +208,6 @@
 #undef THREAD
 #undef HAVE_LINUXTHREADS
 #undef HAVE_NPTL
-#undef HAVE_UNIXWARE7_THREADS
 #endif
 
 #ifdef HAVE_THREADS_WITHOUT_SOCKETS
@@ -264,9 +263,6 @@
 #if !defined(_THREAD_SAFE) && !defined(_AIX)
 #define _THREAD_SAFE            /* Required for OSF1 */
 #endif
-#ifdef HAVE_UNIXWARE7_THREADS
-#include <thread.h>
-#else
 #if defined(HPUX10) || defined(HPUX11)
 C_MODE_START			/* HPUX needs this, signal.h bug */
 #include <pthread.h>
@@ -274,7 +270,6 @@
 #else
 #include <pthread.h>		/* AIX must have this included first */
 #endif
-#endif /* HAVE_UNIXWARE7_THREADS */
 #if !defined(SCO) && !defined(_REENTRANT)
 #define _REENTRANT	1	/* Threads requires reentrant code */
 #endif