merge with 3.23.51

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
  Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
  Auto merged
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/charset.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/raid.cc:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/Makefile.am:
  Auto merged

12 files changed, 110 insertions, 281 deletions

diff --git a/mit-pthreads/Changes-mysql b/mit-pthreads/Changes-mysql
index 420434db98f..da30f66fdec 100644
--- a/mit-pthreads/Changes-mysql
+++ b/mit-pthreads/Changes-mysql
@@ -1,5 +1,9 @@
 Changes done to this distrubtion (pthreads-1_60_beta6) by Monty (monty@mysql.com)
 
+02.05.07
+- Hacked some files to get it to compile (not work) with glibc 2.2
+  This is needed so that we can do 'make dist' in the MySQL distribution
+
 02.04.26
 - removed the following files because of copyright problems
 
diff --git a/mit-pthreads/GNUmakefile b/mit-pthreads/GNUmakefile
index a36f425c7a7..e3fd53b48e5 100644
--- a/mit-pthreads/GNUmakefile
+++ b/mit-pthreads/GNUmakefile
@@ -19,7 +19,7 @@ INSTALL_PATH = $(exec_prefix)
           AR = ar
           AS = gas
       CFLAGS = -I. -Iinclude -I$(srcdir)/include -DPTHREAD_KERNEL \
-		-O6 -DDBUG_OFF   -Werror
+		-O3 -DDBUG_OFF   -Werror
     CXXFLAGS = -I. -Iinclude -I$(srcdir)/include -DPTHREAD_KERNEL \
 		-g -O2
           LD = gld
diff --git a/mit-pthreads/include/pthread/ac-types.h b/mit-pthreads/include/pthread/ac-types.h
index 0a13d320e88..7fa4568817f 100644
--- a/mit-pthreads/include/pthread/ac-types.h
+++ b/mit-pthreads/include/pthread/ac-types.h
@@ -1,11 +1,10 @@
 #ifndef pthread_size_t
-#define pthread_ipaddr_type unsigned int
+#define pthread_ipaddr_type unsigned long
 #define pthread_ipport_type unsigned short
 #define pthread_clock_t long
 #define pthread_size_t unsigned int
 #define pthread_ssize_t int
 #define pthread_time_t long
-#define pthread_fpos_t long
 #define pthread_off_t long
 #define pthread_va_list void *
 #endif
diff --git a/mit-pthreads/include/pthread/paths.h b/mit-pthreads/include/pthread/paths.h
index 8af9233a67c..bf2bf9d01a2 100644
--- a/mit-pthreads/include/pthread/paths.h
+++ b/mit-pthreads/include/pthread/paths.h
@@ -1,8 +1,8 @@
 #ifndef _SYS___PATHS_H_
 #define _SYS___PATHS_H_
 #define _PATH_PTY "/dev/"
-#define _PATH_TZDIR "/usr/share/zoneinfo"
-#define _PATH_TZFILE "/etc/localtime"
+#define _PATH_TZDIR "/usr/lib/zoneinfo"
+#define _PATH_TZFILE "/usr/lib/zoneinfo/localtime"
 #define _PATH_RESCONF "/etc/resolv.conf"
 #define _PATH_HOSTS "/etc/hosts"
 #define _PATH_NETWORKS "/etc/networks"
diff --git a/mit-pthreads/machdep/engine-i386-linux-2.0.h b/mit-pthreads/machdep/engine-i386-linux-2.0.h
index 721618a6f19..f4f75621226 100644
--- a/mit-pthreads/machdep/engine-i386-linux-2.0.h
+++ b/mit-pthreads/machdep/engine-i386-linux-2.0.h
@@ -4,6 +4,7 @@
  * $Id$
  */
 
+/* Avoid problem with including bits/pthreadtypes.h with libc 2.2 */
 
 #include <unistd.h>
 #include <setjmp.h>
diff --git a/mit-pthreads/machdep/linux-2.0/__signal.h b/mit-pthreads/machdep/linux-2.0/__signal.h
index 4cd671f155c..81136b8c14d 100755
--- a/mit-pthreads/machdep/linux-2.0/__signal.h
+++ b/mit-pthreads/machdep/linux-2.0/__signal.h
@@ -1,24 +1,86 @@
 #include <features.h>
-#include <linux/signal.h>
+
+#define SIGHUP		 1
+#define SIGINT		 2
+#define SIGQUIT		 3
+#define SIGILL		 4
+#define SIGTRAP		 5
+#define SIGABRT		 6
+#define SIGIOT		 6
+#define SIGBUS		 7
+#define SIGFPE		 8
+#define SIGKILL		 9
+#define SIGUSR1		10
+#define SIGSEGV		11
+#define SIGUSR2		12
+#define SIGPIPE		13
+#define SIGALRM		14
+#define SIGTERM		15
+#define SIGSTKFLT	16
+#define SIGCHLD		17
+#define SIGCONT		18
+#define SIGSTOP		19
+#define SIGTSTP		20
+#define SIGTTIN		21
+#define SIGTTOU		22
+#define SIGURG		23
+#define SIGXCPU		24
+#define SIGXFSZ		25
+#define SIGVTALRM	26
+#define SIGPROF		27
+#define SIGWINCH	28
+#define SIGIO		29
+#define SIGPOLL		SIGIO
+/*
+#define SIGLOST		29
+*/
+#define SIGPWR		30
+#define SIGSYS		31
+#define	SIGUNUSED	31
+
+#define	_NSIG		64	/* Biggest signal number + 1
+				   (including real-time signals).  */
+# define NSIG	_NSIG
+
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN	32
+#define SIGRTMAX	(_NSIG-1)
 
 #ifndef SIGCLD
 #define SIGCLD		SIGCHLD
 #endif
 
-typedef int sig_atomic_t;
 
-typedef __sighandler_t	SignalHandler;
+/* Type of a signal handler.  */
+typedef void (*__sighandler_t)(int);
+
+#define SIG_DFL	((__sighandler_t)0)	/* default signal handling */
+#define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
+#define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
 
-#define SignalBad		((SignalHandler)-1)
+typedef int sig_atomic_t;
+
+#define SignalBad	((SignalHandler)-1)
 #define SignalDefault	((SignalHandler)0)
 #define SignalIgnore	((SignalHandler)1)
 
-#define	__sigmask(sig)		(1 << ((sig) - 1))
-#define	sigmask				__sigmask
+#include "bits/sigset.h"
+
+#define	__SIGFILLSET		{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
+#define	__SIGEMPTYSET		{ 0,0,0,0,0,0,0,0 }
+#define	__SIGADDSET(s,n)	__sigaddset((s),(n))
+#define	__SIGDELSET(s,n)	__sigdelset((s),(n))
+#define	__SIGISMEMBER(s,n)	__sigismember((s),(n))
+
 
-#define	__SIGFILLSET		0xffffffff
-#define	__SIGEMPTYSET		0
-#define	__SIGADDSET(s,n)	((*s) |= (__sigmask(n)))
-#define	__SIGDELSET(s,n)	((*s) &= ~(__sigmask(n))) 
-#define	__SIGISMEMBER(s,n)	((*s) & (__sigmask(n))) 
+struct sigaction {
+	__sighandler_t sa_handler;
+	unsigned long sa_flags;
+	void (*sa_restorer)(void);
+	sigset_t sa_mask;		/* mask last for extensibility */
+};
 
+/* Values for the HOW argument to `sigprocmask'.  */
+#define	SIG_BLOCK     0		 /* Block signals.  */
+#define	SIG_UNBLOCK   1		 /* Unblock signals.  */
+#define	SIG_SETMASK   2		 /* Set the set of blocked signals.  */
diff --git a/mit-pthreads/machdep/linux-2.0/__stdio.h b/mit-pthreads/machdep/linux-2.0/__stdio.h
index eb7e904c34d..38deb337038 100755
--- a/mit-pthreads/machdep/linux-2.0/__stdio.h
+++ b/mit-pthreads/machdep/linux-2.0/__stdio.h
@@ -4,4 +4,9 @@
 typedef pthread_size_t  size_t;
 #endif
 
+/* Hack for configuration with libgcc 2.2 */
+#ifndef pthread_fpos_t
+#define pthread_fpos_t long
+#endif
+
 typedef pthread_fpos_t fpos_t;
diff --git a/mit-pthreads/machdep/linux-2.0/extra/bits/pthreadtypes.h b/mit-pthreads/machdep/linux-2.0/extra/bits/pthreadtypes.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mit-pthreads/machdep/linux-2.0/extra/bits/pthreadtypes.h
diff --git a/mit-pthreads/machdep/linux-2.0/extra/bits/socket.h b/mit-pthreads/machdep/linux-2.0/extra/bits/socket.h
index cc4c0fd262e..1814e189b64 100755
--- a/mit-pthreads/machdep/linux-2.0/extra/bits/socket.h
+++ b/mit-pthreads/machdep/linux-2.0/extra/bits/socket.h
@@ -1,11 +1,11 @@
-/* ==== socket.h.h ============================================================
+/* ==== socket.h ============================================================
  * Copyright (c) 1994 by Chris Provenzano, proven@athena.mit.edu	
  *
  * Description : Correct Linux header file.
  */
 
-#ifndef _PTHREAD_SOCKET_H_
-#define _PTHREAD_SOCKET_H_
+#ifndef _PTHREAD_BITS_SOCKET_H_
+#define _PTHREAD_BITS_SOCKET_H_
 
 /* #include <linux/socket.h> */
 #ifndef _LINUX_SOCKET_H
@@ -26,6 +26,15 @@
 
 #endif
 
+/* Fixes to be able to configure with glibc 2.2 */
+typedef unsigned short int sa_family_t;
+#define	__SOCKADDR_COMMON(sa_prefix) \
+  sa_family_t sa_prefix##family
+#define __SOCKADDR_COMMON_SIZE	(sizeof (unsigned short int))
+
+/* Type for length arguments in socket calls.  */
+typedef unsigned int socklen_t;
+
 /* #include <asm/socket.h>				arch-dependent defines	*/
 #include <linux/sockios.h>			/* the SIOCxxx I/O controls	*/
 #include <pthread/posix.h>
@@ -156,28 +165,28 @@ struct msghdr
 
 __BEGIN_DECLS
 
-int			accept			__P_((int, struct sockaddr *, int *));
-int			bind			__P_((int, const struct sockaddr *, int));
-int			connect			__P_((int, const struct sockaddr *, int));
+int			accept			__P_((int, struct sockaddr *, socklen_t *));
+int			bind			__P_((int, const struct sockaddr *, socklen_t));
+int			connect			__P_((int, const struct sockaddr *, socklen_t));
 int			listen			__P_((int, int));
 int			socket			__P_((int, int, int));
 
 int getsockopt __P_((int __s, int __level, int __optname,
-                void *__optval, int *__optlen));
+                void *__optval, socklen_t *__optlen));
 int setsockopt __P_((int __s, int __level, int __optname,
-                __const void *__optval, int optlen));
+                __const void *__optval, socklen_t optlen));
 int getsockname __P_((int __sockfd, struct sockaddr *__addr,
-                int *__paddrlen));
+                socklen_t *__paddrlen));
 int getpeername __P_((int __sockfd, struct sockaddr *__peer,
-                int *__paddrlen));
+                socklen_t *__paddrlen));
 ssize_t send __P_((int __sockfd, __const void *__buff, size_t __len, int __flags));
 ssize_t recv __P_((int __sockfd, void *__buff, size_t __len, int __flags));
 ssize_t sendto __P_((int __sockfd, __const void *__buff, size_t __len,
                  int __flags, __const struct sockaddr *__to,
-                 int __tolen));
+                 socklen_t __tolen));
 ssize_t recvfrom __P_((int __sockfd, void *__buff, size_t __len,
                  int __flags, struct sockaddr *__from,
-                 int *__fromlen));
+                 socklen_t *__fromlen));
 extern ssize_t sendmsg __P_((int __fd, __const struct msghdr *__message,
                         int __flags));
 extern ssize_t recvmsg __P_((int __fd, struct msghdr *__message,
@@ -187,7 +196,3 @@ int shutdown __P_((int __sockfd, int __how));
 __END_DECLS
 
 #endif
-
-
-
-
diff --git a/mit-pthreads/machdep/linux-2.0/socket.h b/mit-pthreads/machdep/linux-2.0/socket.h
index fb43c394e10..2a8a04f1903 100755
--- a/mit-pthreads/machdep/linux-2.0/socket.h
+++ b/mit-pthreads/machdep/linux-2.0/socket.h
@@ -1,4 +1,4 @@
-/* ==== socket.h.h ============================================================
+/* ==== socket.h ============================================================
  * Copyright (c) 1994 by Chris Provenzano, proven@athena.mit.edu	
  *
  * Description : Correct Linux header file.
@@ -7,190 +7,7 @@
 #ifndef _PTHREAD_SOCKET_H_
 #define _PTHREAD_SOCKET_H_
 
-/* #include <linux/socket.h> */
-#ifndef _LINUX_SOCKET_H
-#define _LINUX_SOCKET_H
+#include "bits/socket.h"
 
-/* IP options */
-#define IP_TOS				1
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define IP_TTL				2
-#ifndef IP_HDRINCL
-#define IP_HDRINCL			3
 #endif
-#ifdef V1_3_WILL_DO_THIS_FUNKY_STUFF
-#define IP_OPTIONS			4
-#endif
-
-#endif
-
-/* Type for length arguments in socket calls.  */
-typedef unsigned int socklen_t;
-
-/* #include <asm/socket.h>				arch-dependent defines	*/
-#include <linux/sockios.h>			/* the SIOCxxx I/O controls	*/
-#include <pthread/posix.h>
-
-struct sockaddr {
-  	unsigned short	sa_family;		/* address family, AF_xxx	*/
-  	char			sa_data[14];	/* 14 bytes of protocol address	*/
-};
-
-struct linger {
-  	int 			l_onoff;		/* Linger active		*/
-  	int				l_linger;		/* How long to linger for	*/
-};
-
-struct msghdr 
-{
-	void	*		msg_name;		/* Socket name			*/
-	int				msg_namelen;	/* Length of name		*/
-	struct iovec *	msg_iov;		/* Data blocks			*/
-	int 			msg_iovlen;		/* Number of blocks		*/
-	void 	*		msg_accrights;	/* Per protocol magic (eg BSD file descriptor passing) */
-	int				msg_accrightslen;/* Length of rights list */
-};
-
-/* Socket types. */
-#define SOCK_STREAM	1				/* stream (connection) socket	*/
-#define SOCK_DGRAM	2				/* datagram (conn.less) socket	*/
-#define SOCK_RAW	3				/* raw socket			*/
-#define SOCK_RDM	4				/* reliably-delivered message	*/
-#define SOCK_SEQPACKET	5			/* sequential packet socket	*/
-#define SOCK_PACKET	10				/* linux specific way of	*/
-									/* getting packets at the dev	*/
-									/* level.  For writing rarp and	*/
-									/* other similar things on the	*/
-									/* user level.			*/
-
-/* Supported address families. */
-#define AF_UNSPEC	0
-#define AF_UNIX		1				/* Unix domain sockets 		*/
-#define AF_INET		2				/* Internet IP Protocol 	*/
-#define AF_AX25		3				/* Amateur Radio AX.25 		*/
-#define AF_IPX		4				/* Novell IPX 			*/
-#define AF_APPLETALK 5				/* Appletalk DDP 		*/
-#define	AF_NETROM	6				/* Amateur radio NetROM 	*/
-#define AF_BRIDGE	7				/* Multiprotocol bridge 	*/
-#define AF_AAL5		8				/* Reserved for Werner's ATM 	*/
-#define AF_X25		9				/* Reserved for X.25 project 	*/
-#define AF_INET6	10				/* IP version 6			*/
-#define AF_MAX		12				/* For now.. */
-
-/* Protocol families, same as address families. */
-#define PF_UNSPEC	AF_UNSPEC
-#define PF_UNIX		AF_UNIX
-#define PF_INET		AF_INET
-#define PF_AX25		AF_AX25
-#define PF_IPX		AF_IPX
-#define PF_APPLETALK AF_APPLETALK
-#define	PF_NETROM	AF_NETROM
-#define PF_BRIDGE	AF_BRIDGE
-#define PF_AAL5		AF_AAL5
-#define PF_X25		AF_X25
-#define PF_INET6	AF_INET6
-
-#define PF_MAX		AF_MAX
-
-/* Maximum queue length specificable by listen.  */
-#define SOMAXCONN	128
-
-/* Flags we can use with send/ and recv. */
-#define MSG_OOB		1
-#define MSG_PEEK	2
-#define MSG_DONTROUTE	4
-
-/* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */
-#define SOL_SOCKET	1
-#define SOL_IP		0
-#define SOL_IPX		256
-#define SOL_AX25	257
-#define SOL_ATALK	258
-#define	SOL_NETROM	259
-#define SOL_TCP		6
-#define SOL_UDP		17
-
-/* For setsockoptions(2) */
-#define SO_DEBUG	1
-#define SO_REUSEADDR	2
-#define SO_TYPE		3
-#define SO_ERROR	4
-#define SO_DONTROUTE	5
-#define SO_BROADCAST	6
-#define SO_SNDBUF	7
-#define SO_RCVBUF	8
-#define SO_KEEPALIVE	9
-#define SO_OOBINLINE	10
-#define SO_NO_CHECK	11
-#define SO_PRIORITY	12
-#define SO_LINGER	13
-/* To add :#define SO_REUSEPORT 14 */
-
-
-#define IP_MULTICAST_IF			32
-#define IP_MULTICAST_TTL 		33
-#define IP_MULTICAST_LOOP 		34
-#define IP_ADD_MEMBERSHIP		35
-#define IP_DROP_MEMBERSHIP		36
-
-
-/* These need to appear somewhere around here */
-#define IP_DEFAULT_MULTICAST_TTL        1
-#define IP_DEFAULT_MULTICAST_LOOP       1
-#define IP_MAX_MEMBERSHIPS              20
- 
-/* IPX options */
-#define IPX_TYPE	1
-
-/* TCP options - this way around because someone left a set in the c library includes */
-#define TCP_NODELAY	1
-#define TCP_MAXSEG	2
-
-/* The various priorities. */
-#define SOPRI_INTERACTIVE	0
-#define SOPRI_NORMAL		1
-#define SOPRI_BACKGROUND	2
-
-/* 
- * Functions
- */
-
-__BEGIN_DECLS
-
-int			accept			__P_((int, struct sockaddr *, socklen_t *));
-int			bind			__P_((int, const struct sockaddr *, socklen_t));
-int			connect			__P_((int, const struct sockaddr *, socklen_t));
-int			listen			__P_((int, int));
-int			socket			__P_((int, int, int));
-
-int getsockopt __P_((int __s, int __level, int __optname,
-                void *__optval, socklen_t *__optlen));
-int setsockopt __P_((int __s, int __level, int __optname,
-                __const void *__optval, socklen_t optlen));
-int getsockname __P_((int __sockfd, struct sockaddr *__addr,
-                socklen_t *__paddrlen));
-int getpeername __P_((int __sockfd, struct sockaddr *__peer,
-                socklen_t *__paddrlen));
-ssize_t send __P_((int __sockfd, __const void *__buff, size_t __len, int __flags));
-ssize_t recv __P_((int __sockfd, void *__buff, size_t __len, int __flags));
-ssize_t sendto __P_((int __sockfd, __const void *__buff, size_t __len,
-                 int __flags, __const struct sockaddr *__to,
-                 socklen_t __tolen));
-ssize_t recvfrom __P_((int __sockfd, void *__buff, size_t __len,
-                 int __flags, struct sockaddr *__from,
-                 socklen_t *__fromlen));
-extern ssize_t sendmsg __P_((int __fd, __const struct msghdr *__message,
-                        int __flags));
-extern ssize_t recvmsg __P_((int __fd, struct msghdr *__message,
-                        int __flags));
-int shutdown __P_((int __sockfd, int __how));
-
-__END_DECLS
-
-#endif
-
-
-
 
diff --git a/mit-pthreads/pg++ b/mit-pthreads/pg++
deleted file mode 100755
index 0d5f78929ae..00000000000
--- a/mit-pthreads/pg++
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-pthreads_root=/usr/local/pthreads
-build_root=/dr1/my/masters/mysql/mit-pthreads
-src_root=/dr1/my/masters/mysql/mit-pthreads
-
-include_dir='-I$pthreads_root/include'
-lib_dir='-L$pthreads_root/lib'
-libs='-lpthread -lm -lgcc -lpthread'
-
-# Might be a good idea to also provide a way to override pthreads_root
-# so that we can use this script in the build tree, before installation.
-if arg="$1" ; then
-    case $arg in
-    -notinstalled)
-        include_dir='-I$build_root/include -I$src_root/include'
-        lib_dir='-L$build_root/obj'
-        shift
-        ;;
-    esac
-fi
-
-for arg in "$@" ; do
-    case $arg in
-	-nostdinc)	include_dir= ;;
-	-nostdlib | -c)	libs= ;;
-    esac
-done
-
-# Include the -L option in any case, just in case the user provided the
-# names of some libraries we've built threaded versions of.
-eval exec g++ '"$@"' $include_dir $lib_dir $libs
diff --git a/mit-pthreads/pgcc b/mit-pthreads/pgcc
deleted file mode 100755
index 6eed8a2d0f0..00000000000
--- a/mit-pthreads/pgcc
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-pthreads_root=/usr/local/pthreads
-build_root=/dr1/my/masters/mysql/mit-pthreads
-src_root=/dr1/my/masters/mysql/mit-pthreads
-
-include_dir='-I$pthreads_root/include'
-lib_dir='-L$pthreads_root/lib'
-libs='-lpthread -lm -lgcc -lpthread'
-
-# Might be a good idea to also provide a way to override pthreads_root
-# so that we can use this script in the build tree, before installation.
-if arg="$1" ; then
-    case $arg in
-    -notinstalled)
-        include_dir='-I$build_root/include -I$src_root/include'
-        lib_dir='-L$build_root/obj'
-        shift
-        ;;
-    esac
-fi
-
-for arg in "$@" ; do
-    case $arg in
-	-nostdinc)	include_dir= ;;
-	-nostdlib | -c)	libs= ;;
-    esac
-done
-
-# Include the -L option in any case, just in case the user provided the
-# names of some libraries we've built threaded versions of.
-eval exec gcc '"$@"' $include_dir $lib_dir $libs