Update MySQL to 3.22.27.

There are a bunch of bug fixes to the server.  See the documentation for
a complete list.

Also, get rid of USE_GMAKE.  Our make is fine now.

8 files changed, 50 insertions, 49 deletions

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index 860f99d4cdc..d0006c3fc52 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1999/08/24 18:55:27 bad Exp $
+# $NetBSD: Makefile,v 1.4 1999/12/13 20:31:51 bad Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.27
 PKGNAME=	${DISTNAME:S/-/-client-/}
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+=--without-readline
 
 CFLAGS+=	-Dunix
 
-USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 
diff --git a/databases/mysql-client/files/md5 b/databases/mysql-client/files/md5
index 8d9a4b3d98e..b36f64434e8 100644
--- a/databases/mysql-client/files/md5
+++ b/databases/mysql-client/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+$NetBSD: md5,v 1.2 1999/12/13 20:31:52 bad Exp $
 
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.27.tar.gz) = 385bee829a157b0a50e61402fc859035
diff --git a/databases/mysql-client/files/patch-sum b/databases/mysql-client/files/patch-sum
index d5d421606cc..9adb2eb2533 100644
--- a/databases/mysql-client/files/patch-sum
+++ b/databases/mysql-client/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/11/15 17:16:22 rh Exp $
+$NetBSD: patch-sum,v 1.3 1999/12/13 20:31:52 bad Exp $
 
-MD5 (patch-aa) = ebf5a553dc0815933e429a986955e240
-MD5 (patch-ab) = da094a8b12f78d3e3d33c22db373623f
-MD5 (patch-ac) = cf9012d588a3175955e35581a3632553
-MD5 (patch-ad) = 4f7aa7295a67321207781f215e0c7755
+MD5 (patch-aa) = 9c60a2b8c672ac49a009def9ceadaf6a
+MD5 (patch-ab) = de2ca559bf97dcd386e31bdf5e8ecd31
+MD5 (patch-ac) = 3143642509578a72e2c3a276943bd340
+MD5 (patch-ad) = 1a91e8b2a16c7100e41213ae560df4c3
diff --git a/databases/mysql-client/patches/patch-aa b/databases/mysql-client/patches/patch-aa
index b625a3a97ed..8441b444cf9 100644
--- a/databases/mysql-client/patches/patch-aa
+++ b/databases/mysql-client/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+$NetBSD: patch-aa,v 1.2 1999/12/13 20:31:52 bad Exp $
 
---- client/Makefile.in.orig	Mon Mar 15 15:49:57 1999
-+++ client/Makefile.in	Sun Mar 21 23:11:42 1999
-@@ -181,7 +181,7 @@
+--- client/Makefile.in.orig	Thu Jul  8 06:33:30 1999
++++ client/Makefile.in	Mon Aug 16 23:15:23 1999
+@@ -174,7 +174,7 @@
  libmysqlclient_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
- CLEANFILES =		$(libmysqlclient_la_LIBADD) $(SHLIBOBJS) \
- 			libmysqclient.la
--DEFS =			-DUNDEF_THREADS_HACK
-+DEFS =			-DUNDEF_THREADS_HACK -Dunix
+ CLEANFILES = $(libmysqlclient_la_LIBADD) $(SHLIBOBJS) 			libmysqclient.la
+ 
+-DEFS = -DUNDEF_THREADS_HACK
++DEFS = -DUNDEF_THREADS_HACK -Dunix
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
diff --git a/databases/mysql-client/patches/patch-ab b/databases/mysql-client/patches/patch-ab
index 7c219573214..093bdc5027e 100644
--- a/databases/mysql-client/patches/patch-ab
+++ b/databases/mysql-client/patches/patch-ab
@@ -1,24 +1,24 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+$NetBSD: patch-ab,v 1.2 1999/12/13 20:31:52 bad Exp $
 
---- configure.orig	Wed Apr 28 21:03:38 1999
-+++ configure	Mon May  3 18:27:59 1999
-@@ -1691,6 +1691,7 @@
-   echo "$ac_t""no" 1>&6
+--- configure.orig	Thu Jul  8 06:13:39 1999
++++ configure	Mon Aug 16 23:35:52 1999
+@@ -1920,6 +1920,7 @@
  fi
  
+ 
 +if false; then
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -2073,6 +2074,7 @@
+ 
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1736,6 +1737,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
- # AC_PROG_INSTALL We should only need a AM_PROG_INSTALL
- 
-@@ -6950,7 +6952,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -7697,7 +7699,7 @@
    # This requires readline to be in a standard place. Mosty for linux
    # there readline may be a shared library.
    readline_dir=""
diff --git a/databases/mysql-client/patches/patch-ac b/databases/mysql-client/patches/patch-ac
index 59ad1cb791f..09e95350eb1 100644
--- a/databases/mysql-client/patches/patch-ac
+++ b/databases/mysql-client/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1999/11/15 17:16:22 rh Exp $
+$NetBSD: patch-ac,v 1.3 1999/12/13 20:31:52 bad Exp $
 
---- client/get_password.c.orig	Thu Nov 26 21:00:42 1998
-+++ client/get_password.c	Mon Nov 15 18:12:46 1999
-@@ -27,8 +27,8 @@
+--- client/get_password.c.orig	Sun Jun 14 16:26:27 1998
++++ client/get_password.c	Sun Jun 14 19:25:24 1998
+@@ -18,8 +18,8 @@
  #include	<termio.h>
  #define TERMIO	struct termio
  #else
@@ -11,9 +11,9 @@ $NetBSD: patch-ac,v 1.2 1999/11/15 17:16:22 rh Exp $
 +#include	<termios.h>
 +#define TERMIO	struct termios
  #endif
- #endif
  #ifdef alpha_linux_port
-@@ -130,13 +130,14 @@
+ #include <asm/ioctls.h>				/* QQ; Fix this in configure */
+@@ -92,13 +92,14 @@
    get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
    ioctl(fileno(stdin),(int) TCSETA, &org);
  #else
diff --git a/databases/mysql-client/patches/patch-ad b/databases/mysql-client/patches/patch-ad
index f9235ccfee5..52683d7a2e0 100644
--- a/databases/mysql-client/patches/patch-ad
+++ b/databases/mysql-client/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/05/06 23:22:28 tv Exp $
+$NetBSD: patch-ad,v 1.2 1999/12/13 20:31:53 bad Exp $
 
---- readline/Makefile.in.orig	Mon May  3 18:47:25 1999
-+++ readline/Makefile.in	Mon May  3 18:47:36 1999
-@@ -377,7 +377,7 @@
- install-data: install-pkgincludeHEADERS
- 	@$(NORMAL_INSTALL)
+--- readline/Makefile.in.orig	Sun Dec  5 21:35:26 1999
++++ readline/Makefile.in	Sun Dec  5 21:38:20 1999
+@@ -388,7 +388,8 @@
  
--install: install-exec install-data all
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
 +install: all
- 	@:
- 
- uninstall: uninstall-pkgincludeHEADERS
++	@:
+ uninstall-am: uninstall-pkgincludeHEADERS
+ uninstall: uninstall-am
+ all-am: Makefile $(LIBRARIES) $(HEADERS)
diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST
index fc34ca5469b..db5412ee617 100644
--- a/databases/mysql-client/pkg/PLIST
+++ b/databases/mysql-client/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/05/06 23:22:28 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/12/13 20:31:53 bad Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_zap
+bin/mysql_find_rows
 bin/mysql_fix_privilege_tables
 bin/mysqlaccess
 bin/mysqladmin
@@ -28,7 +29,7 @@ lib/mysql/libmysqlclient.so.6.0
 share/mysql/binary-configure
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.27.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 man/man1/mysql.1