Update to mysql-3.22.21.

There are way too many changes and new features to list them here.
The most notable change is the introduction of the GRANT system which
requires fixing the privilege tables when upgrading.
See the mysql manual.

XXX Todo: fix installation of mysql.server script.

9 files changed, 68 insertions, 207 deletions

diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile
index 4efb9187b57..78453765ab2 100644
--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.16 1999/02/20 22:48:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 1999/04/09 15:39:38 bad Exp $
 #
 
-# note: if updated, update shlib version number in patch-aa
-DISTNAME=	mysql-3.21.33b
+DISTNAME=	mysql-3.22.21
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.21/ \
-		ftp://ftp.netcasting.net/pub/mysql/Downloads/MySQL-3.21/
+MASTER_SITES=	ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
+		ftp://ftp.netcasting.net/pub/mysql/Downloads/MySQL-3.22/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.tcx.se/
+HOMEPAGE=	http://www.mysql.com/
 
 NO_CDROM=	"Restrictive license."
 
@@ -16,7 +15,9 @@ MYSQL_DATADIR?=	/var/mysql
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--localstatedir=${MYSQL_DATADIR} \
-		--without-perl --without-debug
+		--with-named-z-libs='z' \
+		--without-perl --without-debug --without-bench \
+		--with-low-memory
 CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
@@ -44,9 +45,13 @@ pre-configure:
 .else
 NO_PACKAGE=	"mysql_install_db needs data dir from distribution."
 
-post-install:
-	(cd ${WRKSRC}; ./scripts/mysql_install_db && mysqladmin shutdown)
+post-install::
+	(cd ${WRKSRC}; ./scripts/mysql_install_db)
 	@${CAT} ${PKGDIR}/PLIST-server >>${PLIST_SRC}
 .endif
 
+post-install::
+	${ECHO} @dirrm lib/mysql >>${PLIST_SRC}
+	${ECHO} @dirrm share/mysql >>${PLIST_SRC}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql/files/md5 b/databases/mysql/files/md5
index f39772dbd3e..962cec565ba 100644
--- a/databases/mysql/files/md5
+++ b/databases/mysql/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/10/28 18:18:08 bad Exp $
+$NetBSD: md5,v 1.6 1999/04/09 15:39:38 bad Exp $
 
-MD5 (mysql-3.21.33b.tar.gz) = 6a54652a36831a0e75d4056c69ba1303
+MD5 (mysql-3.22.21.tar.gz) = 290b586a47de28f9bb4831f7d80a932f
diff --git a/databases/mysql/patches/patch-aa b/databases/mysql/patches/patch-aa
index 23fcbece3fd..4d2a918732b 100644
--- a/databases/mysql/patches/patch-aa
+++ b/databases/mysql/patches/patch-aa
@@ -1,92 +1,13 @@
-$NetBSD: patch-aa,v 1.5 1999/04/08 21:52:21 bad Exp $
+$NetBSD: patch-aa,v 1.6 1999/04/09 15:39:38 bad Exp $
 
---- client/Makefile.in.orig	Wed Jul  8 11:10:53 1998
-+++ client/Makefile.in	Thu Feb  4 17:12:10 1999
-@@ -42,8 +42,8 @@
- AUTOHEADER = @AUTOHEADER@
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = $(LIBTOOL) --mode=install @INSTALL_PROGRAM@
-+INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
- 
-@@ -115,21 +115,21 @@
- mystrings_charset = @mystrings_charset@
- perl_dirs = @perl_dirs@
- readline_dir = @readline_dir@
--readline_link = @readline_link@
-+readline_link = ../readline/libreadline.a
- server_scripts = @server_scripts@
- sql_server_dirs = @sql_server_dirs@
- 
- INCLUDES =		-I$(srcdir)/../include -I../include \
- 			-I$(srcdir)/.. -I$(top_srcdir) -I..
- LIBS =			@CLIENT_LIBS@
--LDADD =			-L. -lmysqlclient
--pkglib_LIBRARIES =	libmysqlclient.a
--LIBFILES =		libmysqlclient.a @shlib@
-+LDADD =			libmysqlclient.la
-+pkglib_LIBRARIES =	libmysqlclient.la
-+LIBFILES =		libmysqlclient.la
- bin_PROGRAMS =		mysql mysqladmin mysqlshow mysqldump mysqlimport
- noinst_PROGRAMS =	insert_test select_test
- noinst_HEADERS =	sql_string.h completion_hash.h
- mysql_SOURCES =		mysql.cc readline.cc sql_string.cc completion_hash.cc
--mysql_LDADD =		@readline_link@ @TERMCAP_LIB@ $(LDADD)
-+mysql_LDADD =		$(readline_link) @TERMCAP_LIB@ $(LDADD)
- mysql_DEPENDENCIES=		$(LIBRARIES)
- mysqladmin_DEPENDENCIES=	$(LIBRARIES)
- mysqlshow_DEPENDENCIES=		$(LIBRARIES)
-@@ -167,7 +167,7 @@
- CLEANFILES =		$(libmysqlclient_a_LIBADD) $(SHLIBOBJS) \
- 			libmysqlclient.so libmysqlclient.so.@VERSION@
- 
+--- 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 @@
+ libmysqlclient_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
+ 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 = 
-@@ -218,10 +218,10 @@
- select_test_LDFLAGS = 
- CXXFLAGS = @CXXFLAGS@
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
--CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS =  $(noinst_HEADERS)
- 
- DIST_COMMON =  Makefile.am Makefile.in
-@@ -265,12 +265,6 @@
- 	  else :; fi; \
- 	done
- 	@$(POST_INSTALL)
--	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(RANLIB) $(pkglibdir)/$$p"; \
--	    $(RANLIB) $(pkglibdir)/$$p; \
--	  else :; fi; \
--	done
- 
- uninstall-pkglibLIBRARIES:
- 	$(NORMAL_UNINSTALL)
-@@ -291,10 +285,9 @@
- 
- maintainer-clean-compile:
- 
--libmysqlclient.a: $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_DEPENDENCIES)
--	rm -f libmysqlclient.a
--	$(AR) cru libmysqlclient.a $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_LIBADD)
--	$(RANLIB) libmysqlclient.a
-+libmysqlclient.la: $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_DEPENDENCIES)
-+	$(LIBTOOL) --mode=link $(CC) -o libmysqlclient.la $(libmysqlclient_a_OBJECTS:.o=.lo) $(libmysqlclient_a_LIBADD:.o=.lo) \
-+		-rpath $(pkglibdir) -version-info 321:33
- 
- mostlyclean-binPROGRAMS:
- 
diff --git a/databases/mysql/patches/patch-ab b/databases/mysql/patches/patch-ab
index 1c6a7374b04..6c44f5e6a4b 100644
--- a/databases/mysql/patches/patch-ab
+++ b/databases/mysql/patches/patch-ab
@@ -1,62 +1,20 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:18 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/04/09 15:39:38 bad Exp $
 
---- configure.orig	Wed Jul  8 10:51:31 1998
-+++ configure	Fri Jul 17 11:33:30 1998
-@@ -2897,57 +2897,6 @@
- # For compress in zlib
- #AC_CHECK_LIB(z,compress)
+--- configure.orig	Mon Mar 15 15:31:46 1999
++++ configure	Sun Mar 21 23:55:25 1999
+@@ -1691,6 +1691,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # 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
  
--# Check for gtty if termio.h doesn't exists
--if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
--then
--  echo $ac_n "checking for gtty in -lcompat""... $ac_c" 1>&6
--echo "configure:2905: checking for gtty in -lcompat" >&5
--ac_lib_var=`echo compat'_'gtty | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lcompat  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2913 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char gtty();
--
--int main() {
--gtty()
--; return 0; }
--EOF
--if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo compat | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
--
--  LIBS="-lcompat $LIBS"
--
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--fi
- # We make a special variable for client library's to avoid including
- # thread libs in the client.
- LIBS_AFTER_SOCKET=$LIBS
diff --git a/databases/mysql/patches/patch-af b/databases/mysql/patches/patch-af
deleted file mode 100644
index 2004b8c18cf..00000000000
--- a/databases/mysql/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:40:19 agc Exp $
-
---- Makefile.in.orig	Sun Jun 14 21:37:07 1998
-+++ Makefile.in	Sun Jun 14 21:37:22 1998
-@@ -117,7 +117,7 @@
- EXTRA_DIST =		INSTALL-SOURCE-GENERIC README \
- 			PUBLIC INSTALL-SOURCE # Built from source in Docs dir
- SUBDIRS =		Docs @readline_dir@ client @sql_server_dirs@ \
--			scripts include tests man @bench_dirs@ @perl_dirs@
-+			scripts include tests man # @bench_dirs@ @perl_dirs@
- 
- # Relink after clean
- CLEANFILES =		linked_client_sources
diff --git a/databases/mysql/patches/patch-ag b/databases/mysql/patches/patch-ag
deleted file mode 100644
index 4e4a183e72c..00000000000
--- a/databases/mysql/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 10:40:19 agc Exp $
-
---- scripts/mysql_install_db.sh.orig	Sun Jun 14 23:02:32 1998
-+++ scripts/mysql_install_db.sh	Sun Jun 14 23:05:16 1998
-@@ -34,7 +34,7 @@
-   echo "@scriptdir@/safe_mysqld -l &"
-   echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script"
--  exit 1
-+  exit 0
- fi
- 
- # On IRIX hostname is in /usr/bsd so add this to the path
diff --git a/databases/mysql/patches/patch-bb b/databases/mysql/patches/patch-bb
deleted file mode 100644
index 63c4f9ac793..00000000000
--- a/databases/mysql/patches/patch-bb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.1 1998/12/29 08:12:04 garbled Exp $
---- sql/Makefile.in.orig	Tue Dec 29 00:18:10 1998
-+++ sql/Makefile.in	Tue Dec 29 00:19:42 1998
-@@ -945,7 +945,7 @@
- 
- 
- sql_yacc.o:	sql_yacc.cc sql_yacc.h
--	$(CXXCOMPILE) $(LM_CFLAGS) -c $<
-+	$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) -DDBUG_OFF $(LM_CFLAGS) -c $<
- 
- .cc.so:
- 	$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) -fPIC -share -o $@ $<
diff --git a/databases/mysql/pkg/PLIST-client b/databases/mysql/pkg/PLIST-client
index 4cc0dcfad5f..dac36c9b80b 100644
--- a/databases/mysql/pkg/PLIST-client
+++ b/databases/mysql/pkg/PLIST-client
@@ -1,18 +1,15 @@
-@comment $NetBSD: PLIST-client,v 1.3 1999/02/11 19:17:29 tv Exp $
-bin/add_file_priv
-bin/add_func_table
-bin/add_long_password
-bin/make_binary_distribution
+@comment $NetBSD: PLIST-client,v 1.4 1999/04/09 15:39:38 bad Exp $
 bin/msql2mysql
 bin/mysql
+bin/mysql_zap
+bin/mysql_fix_privilege_tables
 bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
 bin/mysqlimport
 bin/mysqlshow
-bin/which1
-bin/zap
+bin/mysql_setpermission
 include/mysql/chardefs.h
 include/mysql/dbug.h
 include/mysql/errmsg.h
@@ -20,16 +17,24 @@ include/mysql/history.h
 include/mysql/keymaps.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
+include/mysql/my_list.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 include/mysql/readline.h
 include/mysql/tilde.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so.321.33
+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.21.spec
+share/mysql/mysql-log-rotate
+share/mysql/mysql.server
 man/man1/mysql.1
 @dirrm include/mysql
diff --git a/databases/mysql/pkg/PLIST-server b/databases/mysql/pkg/PLIST-server
index bac88623f75..1fc5557b265 100644
--- a/databases/mysql/pkg/PLIST-server
+++ b/databases/mysql/pkg/PLIST-server
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST-server,v 1.2 1999/02/04 21:35:01 frueauf Exp $
+@comment $NetBSD: PLIST-server,v 1.3 1999/04/09 15:39:39 bad Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
-bin/mysql.server
 bin/mysql_install_db
 bin/perror
 bin/replace
 bin/safe_mysqld
+bin/resolveip
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -24,8 +24,14 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+share/mysql/hungarian/errmsg.txt
 share/mysql/italian/errmsg.sys
 share/mysql/italian/errmsg.txt
+share/mysql/japanese/errmsg.sys
+share/mysql/japanese/errmsg.txt
+share/mysql/korean/errmsg.sys
+share/mysql/korean/errmsg.txt
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
 share/mysql/norwegian/errmsg.sys
@@ -38,20 +44,24 @@ share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
 share/mysql/spanish/errmsg.sys
 share/mysql/spanish/errmsg.txt
+share/mysql/slovak/errmsg.sys
+share/mysql/slovak/errmsg.txt
 share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
-@dirrm lib/mysql
 @dirrm share/mysql/czech
 @dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
 @dirrm share/mysql/italian
+@dirrm share/mysql/japanese
+@dirrm share/mysql/korean
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
 @dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
 @dirrm share/mysql/russian
 @dirrm share/mysql/spanish
+@dirrm share/mysql/slovak
 @dirrm share/mysql/swedish
-@dirrm share/mysql