Imported from /home/gentoo/distfiles/mysql-extras-20050908.tar.bz2.mysql-extras-20050908

8 files changed, 430 insertions, 0 deletions

diff --git a/mysql-4.0-my-print-defaults.diff b/mysql-4.0-my-print-defaults.diff
new file mode 100644
index 0000000..b086563
--- /dev/null
+++ b/mysql-4.0-my-print-defaults.diff
@@ -0,0 +1,11 @@
+--- mysql-4.0.1-alpha.orig/mysys/default.c	Sun Dec 23 01:22:08 2001
++++ mysql-4.0.1-alpha/mysys/default.c	Sat Jun 22 18:56:03 2002
+@@ -47,7 +47,7 @@
+ #ifdef __WIN__
+ "C:/",
+ #else
+-"/etc/",
++"/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
diff --git a/mysql-4.0-nisam.h.diff b/mysql-4.0-nisam.h.diff
new file mode 100644
index 0000000..c8d9d67
--- /dev/null
+++ b/mysql-4.0-nisam.h.diff
@@ -0,0 +1,11 @@
+--- include/nisam.h~	Sat Jun 22 18:03:36 2002
++++ include/nisam.h	Sat Jun 22 18:03:53 2002
+@@ -30,7 +30,7 @@
+ 
+ #define N_MAXKEY	16		/* Max allowed keys */
+ #define N_MAXKEY_SEG	16		/* Max segments for key */
+-#define N_MAX_KEY_LENGTH 256		/* May be increased up to 500 */
++#define N_MAX_KEY_LENGTH 500		/* May be increased up to 500 */
+ #define N_MAX_KEY_BUFF	 (N_MAX_KEY_LENGTH+N_MAXKEY_SEG+sizeof(double)-1)
+ #define N_MAX_POSSIBLE_KEY_BUFF 500+9
+ 
diff --git a/mysql-4.0.14-r1-tcpd-vars-fix.diff b/mysql-4.0.14-r1-tcpd-vars-fix.diff
new file mode 100644
index 0000000..18fd9c8
--- /dev/null
+++ b/mysql-4.0.14-r1-tcpd-vars-fix.diff
@@ -0,0 +1,14 @@
+diff -Naur orig/sql/mysqld.cc new/sql/mysqld.cc
+--- orig/sql/mysqld.cc  2003-06-10 22:22:10.000000000 +0200
++++ new/sql/mysqld.cc   2003-06-10 22:21:38.000000000 +0200
+@@ -101,8 +101,8 @@
+ #ifdef NEED_SYS_SYSLOG_H
+ #include <sys/syslog.h>
+ #endif /* NEED_SYS_SYSLOG_H */
+-int allow_severity = LOG_INFO;
+-int deny_severity = LOG_WARNING;
++//int allow_severity = LOG_INFO;
++//int deny_severity = LOG_WARNING;
+ 
+ #ifdef __STDC__
+ #define my_fromhost(A)    fromhost(A)
diff --git a/mysql-4.0.18-gentoo-nptl.diff b/mysql-4.0.18-gentoo-nptl.diff
new file mode 100644
index 0000000..d5815b7
--- /dev/null
+++ b/mysql-4.0.18-gentoo-nptl.diff
@@ -0,0 +1,14 @@
+--- mysql-4.0.18/configure.in.orig	2004-03-04 13:53:36.000000000 -0800
++++ mysql-4.0.18/configure.in	2004-03-04 13:53:37.000000000 -0800
+@@ -1191,7 +1191,10 @@
+ then
+   # Look for LinuxThreads.
+   AC_MSG_CHECKING("LinuxThreads")
+-    res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
++   # res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
++   # All gentoo systems support this stuff, and this is an improper detection
++   # for LinuxThreads anyhow, always set the result to 1
++   res=1
+     if test "$res" -gt 0
+     then
+       AC_MSG_RESULT("Found")
diff --git a/mysql-4.0.18-mysqld-safe-sh.diff b/mysql-4.0.18-mysqld-safe-sh.diff
new file mode 100644
index 0000000..18d4f1c
--- /dev/null
+++ b/mysql-4.0.18-mysqld-safe-sh.diff
@@ -0,0 +1,45 @@
+--- mysql-4.0.18/scripts/mysqld_safe.sh.orig	2004-02-10 10:15:48.000000000 -0800
++++ mysql-4.0.18/scripts/mysqld_safe.sh	2004-03-04 13:45:27.000000000 -0800
+@@ -89,42 +89,14 @@
+   done
+ }
+ 
+-
+-MY_PWD=`pwd`
+-# Check if we are starting this relative (for the binary release)
+-if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "$defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
+-# Check if this is a 'moved install directory'
+-elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
+- -x ./libexec/mysqld
+-then
+-  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/var
+-else
+   MY_BASEDIR_VERSION=@prefix@
+   DATADIR=@localstatedir@
+   ledir=@libexecdir@
+-fi
+ 
+ user=@MYSQLD_USER@
+ niceness=0
+ 
+-# Use the mysqld-max binary by default if the user doesn't specify a binary
+-if test -x $ledir/mysqld-max
+-then
+-  MYSQLD=mysqld-max
+-else
+   MYSQLD=mysqld
+-fi
+ 
+ # these rely on $DATADIR by default, so we'll set them later on
+ pid_file=
diff --git a/mysql-4.0.21-thrssl.patch b/mysql-4.0.21-thrssl.patch
new file mode 100644
index 0000000..e180572
--- /dev/null
+++ b/mysql-4.0.21-thrssl.patch
@@ -0,0 +1,11 @@
+--- mysql-4.0.21/libmysql_r/Makefile.in.orig
++++ mysql-4.0.21/libmysql_r/Makefile.in
+@@ -135,7 +135,7 @@
+ LDFLAGS = @LDFLAGS@
+ LIBDL = @LIBDL@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@ @openssl_libs@
++LIBS = @CLIENT_LIBS@ @openssl_libs@
+ LIBTOOL = @LIBTOOL@
+ LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
+ LM_CFLAGS = @LM_CFLAGS@
diff --git a/mysql-4.0.23-install-db-sh.diff b/mysql-4.0.23-install-db-sh.diff
new file mode 100644
index 0000000..fe3d8d3
--- /dev/null
+++ b/mysql-4.0.23-install-db-sh.diff
@@ -0,0 +1,20 @@
+--- mysql-4.0.23/scripts/mysql_install_db.sh.orig	2004-12-23 02:28:09.755109232 -0800
++++ mysql-4.0.23/scripts/mysql_install_db.sh	2004-12-23 02:31:32.204332272 -0800
+@@ -368,10 +368,13 @@
+     echo
+   fi
+   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
+-  echo "To do so, start the server, then issue the following commands:"
+-  echo "$bindir/mysqladmin -u root password 'new-password'"
+-  echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
+-  echo "See the manual for more instructions."
++  echo "To do so, issue the following commands to start the server"
++  echo "and change the applicable passwords:"
++  echo "  /etc/init.d/mysql start"
++  echo "  $bindir/mysqladmin -u root -h $hostname password 'new-password'"
++  echo "  $bindir/mysqladmin -u root password 'new-password'"
++  echo "Depending on your configuration, a -p option may be needed"
++  echo "in the last command. See the manual for more details."
+   #
+   # Print message about upgrading unless we have created a new db table.
+   if test -z "$c_d"
diff --git a/mysql-4.0.25-r2-asm-pic-fixes.patch b/mysql-4.0.25-r2-asm-pic-fixes.patch
new file mode 100644
index 0000000..48e5517
--- /dev/null
+++ b/mysql-4.0.25-r2-asm-pic-fixes.patch
@@ -0,0 +1,304 @@
+--- mysql-4.0.25/strings/strings-x86.s	2005-06-29 19:06:44.000000000 +0200
++++ mysql/strings/strings-x86.s	2005-07-19 15:41:31.000000000 +0200
+@@ -403,3 +403,5 @@
+ 	ret
+ .strxmov_end:
+ 	.size	 strxmov,.strxmov_end-strxmov
++
++	.section	.note.GNU-stack,"",@progbits
+--- mysql-4.0.25/strings/longlong2str-x86.s	2005-06-29 19:06:43.000000000 +0200
++++ mysql/strings/longlong2str-x86.s	2005-07-19 15:41:31.000000000 +0200
+@@ -13,8 +13,9 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-# Optimized longlong2str function for Intel 80x86  (gcc/gas syntax) 
+-# Some set sequences are optimized for pentuimpro II 
++# longlong2str function for Intel 80x86  (gcc/gas syntax) 
++
++# See longlong2str(dst,radix,val) description in longlong2str.c.
+ 
+ 	.file	"longlong2str.s"
+ 	.version "1.01"
+@@ -24,8 +25,123 @@
+ 
+ .globl	longlong2str
+ 	.type	 longlong2str,@function
+-	
++
+ longlong2str:
++	subl  $80,%esp          # Temporary buffer for up to 64 radix-2 digits
++	pushl %ebp
++	pushl %esi
++	pushl %edi
++	pushl %ebx
++
++	movl  100(%esp),%esi	# esi = Lower part of val 
++	movl  112(%esp),%ebx	# ebx = Radix
++	movl  104(%esp),%ebp	# ebp = Higher part of val 
++	movl  108(%esp),%edi    # edi -> dst
++		 
++	testl %ebx,%ebx
++	jge   .L144             # (Radix >= 0)
++
++	testl %ebp,%ebp
++	jge   .L146             # (Higher part of val >= 0)
++	movb  $45,(%edi)	# Add '-' sign 
++	incl  %edi
++	negl  %esi              # Change val to positive
++	adcl  $0,%ebp
++	negl  %ebp
++.L146:
++	negl  %ebx		# Change radix to positive 
++.L144:
++	cmpl  $36,%ebx          # Radix must be between 2 and 36
++	ja    .Lerror		# (Radix not in range)
++	cmpl  $2,%ebx
++	jb    .Lerror		# (Radix not in range)
++
++	movl  %esi,%eax         # eax = lower part of val ...
++	orl   %ebp,%eax         # and it stays thus if ebp=0
++	je    Lzero             # (Treat zero as special case)
++
++	leal  92(%esp),%ecx     # ecx -> End of temporary buffer
++	
++	testl %ebp,%ebp
++	je    Llow              # (Higher part of val = 0)
++	
++Lhigh:
++	#val in ebp:esi. div the high part by the radix,
++        #then div remainder + low part by the radix.
++	movl  %ebp,%eax	  	# edx=0,eax=high(from ebp) 
++	xorl  %edx,%edx
++        decl  %ecx
++        divl  %ebx         
++	movl  %eax,%ebp         # edx=result of last, eax=low(from esi)
++	movl  %esi,%eax    
++	divl  %ebx
++	movl  %eax,%esi	  	# ebp:esi = quotient 
++	movb  %dl,(%ecx)        # store byte in temporary buffer
++	testl %ebp,%ebp 
++	jne   Lhigh             # (Higher part of val still > 0)
++
++Llow:
++	#val in 0:eax. div 0 + low part by the radix.
++	xorl  %edx,%edx
++        decl  %ecx
++	divl  %ebx
++ 	movb  %dl,(%ecx)        # store byte in temporary buffer
++        testl %eax,%eax
++	jne   Llow              # (Lower part of val still <> 0)
++
++	leal  92(%esp),%esi     # esi -> End of temporary buffer
++
++Lmov:
++	movb  (%ecx),%dl        # dl = byte from temporary buffer
++	movb  $-1,%bl
++	cmpb  $10,%dl           # add 7 if dl > '9'
++	adcb  $0,%bl
++	addb  $48,%dl           # add '0'  
++	andb  $7,%bl
++	addb  %bl,%dl
++        incl  %ecx
++	movb  %dl,(%edi)        # put dl in dst
++	incl  %edi
++	cmpl  %ecx,%esi
++	ja    Lmov              # (more bytes exist in temporary buffer)
++	movb  $0,(%edi)         # trailing '\0' in dst
++	movl  %edi,%eax		# eax = return value = pointer to '\0'
++.Lret:
++	popl %ebx
++	popl %edi
++	popl %esi
++	popl %ebp
++	addl $80,%esp
++	ret
++
++.Lerror:
++	xorl %eax,%eax		# Wrong radix 
++	jmp .Lret
++
++Lzero:
++        # Treat 0 as a special case. Unnecessary but we
++	# expect 0 will be frequent.
++	movl  108(%esp),%eax    # eax = dst
++	popl  %ebx
++        movb  $48,(%eax)        # '0'
++	popl  %edi
++        incl  %eax
++	popl  %esi
++	popl  %ebp
++	addl  $80,%esp
++        movb  $0,(%eax)         # '\0'
++	ret
++
++#
++# This is almost equal to the above, except that we can do the final
++# loop much more efficient	
++#
++
++	.align 4
++	
++.globl	longlong10_to_str
++	.type	 longlong10_to_str,@function
++longlong10_to_str:
+ 	subl $80,%esp
+ 	pushl %ebp
+ 	pushl %esi
+@@ -34,85 +150,82 @@
+ 	movl 100(%esp),%esi	# Lower part of val 
+ 	movl 104(%esp),%ebp	# Higher part of val 
+ 	movl 108(%esp),%edi	# get dst 
+-	movl 112(%esp),%ebx	# Radix 
+-	movl %ebx,%eax
+-	testl %eax,%eax
+-	jge .L144
+-
+-	addl $36,%eax
+-	cmpl $34,%eax
+-	ja .Lerror		# Wrong radix 
+-	testl %ebp,%ebp
+-	jge .L146
++	movl 112(%esp),%ebx	# Radix (10 or -10)
++	testl %ebx,%ebx
++	jge .L10_10		# Positive radix
++
++	negl %ebx		# Change radix to positive (= 10)
++
++	testl %ebp,%ebp		# Test if negative value
++	jge .L10_10
+ 	movb $45,(%edi)		# Add sign 
+-	incl %edi		# Change sign of val 
+-	negl %esi
++	incl %edi
++	negl %esi		# Change sign of val (ebp:esi)
+ 	adcl $0,%ebp
+ 	negl %ebp
+-.L146:
+-	negl %ebx		# Change radix to positive 
+-	jmp .L148
+ 	.align 4
+-.L144:
+-	addl $-2,%eax
+-	cmpl $34,%eax
+-	ja .Lerror		# Radix in range 
+ 
+-.L148:
++.L10_10:
++	leal 92(%esp),%ecx	# End of buffer 
+ 	movl %esi,%eax		# Test if zero (for easy loop) 
+ 	orl %ebp,%eax
+-	jne .L150
++	jne .L10_30		# Not zero
++
++	# Here when value is zero
+ 	movb $48,(%edi)
+ 	incl %edi
+-	jmp .L164
+-	.align 4
+-
+-.L150:
+-	leal 92(%esp),%ecx	# End of buffer 
+-	jmp  .L155
++	jmp .L10_end
+ 	.align 4
+ 
+-.L153:
++.L10_20:
+ 	# val is stored in in ebp:esi 
+-
+ 	movl %ebp,%eax		# High part of value 
+ 	xorl %edx,%edx
+-	divl %ebx
++	divl %ebx		# Divide by 10
+ 	movl %eax,%ebp
+ 	movl %esi,%eax
+-	divl %ebx
+-	movl %eax,%esi		# quotent in ebp:esi 
+-	movb _dig_vec(%edx),%al   # al is faster than dl 
++	divl %ebx		# Divide by 10
+ 	decl %ecx
+-	movb %al,(%ecx)		# store value in buff 
+-	.align 4
+-.L155:
++	movl %eax,%esi		# quotent in ebp:esi 
++	addl $48,%edx		# Convert to ascii
++	movb %dl,(%ecx)		# store value in buff 
++
++.L10_30:
+ 	testl %ebp,%ebp
+-	ja .L153
++	ja .L10_20
+ 	testl %esi,%esi		# rest value 
+-	jl .L153
+-	je .L160		# Ready 
+-	movl %esi,%eax
+-	movl $_dig_vec,%ebp
+-	.align 4
++	jl .L10_20		# Unsigned, do ulonglong div once more
++	je .L10_mov		# Ready
++	movl %esi,%ebx		# Move val to %ebx
++
++	# The following code uses some tricks to change division by 10 to
++	# multiplication and shifts
++	movl $0xcccccccd,%esi   # set %esi to 0xcccccccd
++	
++.L10_40:
++        movl %ebx,%eax
++        mull %esi
++        decl %ecx
++        shrl $3,%edx
++        leal (%edx,%edx,4),%eax
++        addl %eax,%eax
++        subb %al,%bl		# %bl now contains val % 10
++        addb $48,%bl
++        movb %bl,(%ecx)
++        movl %edx,%ebx
++        testl %ebx,%ebx
++	jne .L10_40
++#	jmp .L10_mov		# Shared end with longlong10_to_str
+ 
+-.L154:				# Do rest with integer precision 
+-	cltd
+-	divl %ebx
+-	decl %ecx
+-	movb (%edx,%ebp),%dl	# bh is always zero as ebx=radix < 36 
+-	testl %eax,%eax
+-	movb %dl,(%ecx)
+-	jne .L154
+ 
+-.L160:
++.L10_mov:
+ 	movl %ecx,%esi
+ 	leal 92(%esp),%ecx	# End of buffer 
+ 	subl %esi,%ecx
+ 	rep
+ 	movsb
+ 
+-.L164:
++.L10_end:
+ 	movl %edi,%eax		# Pointer to end null 
+ 	movb $0,(%edi)		# Store the end null 
+ 
+@@ -123,18 +236,8 @@
+ 	popl %ebp
+ 	addl $80,%esp
+ 	ret
+-
+-.Lerror:
+-	xorl %eax,%eax		# Wrong radix 
+-	jmp .L165
+-
+-.Lfe3:
+-	.size	 longlong2str,.Lfe3-longlong2str
+-
+-.globl	longlong10_to_str
+-	.type	 longlong10_to_str,@function
+-longlong10_to_str:
+-	jmp longlong2str
+-
++	
+ .L10end:
+ 	.size	 longlong10_to_str,.L10end-longlong10_to_str
++
++	.section	.note.GNU-stack,"",@progbits