From f8f2fea305aa819751dd0168759878ae93fdde48 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Tue, 30 Dec 2003 05:57:30 +0000
Subject: [PATCH] upgrade to MySQL 4.0.17

LOTS of people have asked for this so here is my work in progress.
test as much as possible.
---
 databases/mysql/Makefile                      |  60 ++---
 databases/mysql/distinfo                      |   6 +-
 databases/mysql/patches/patch-aclocal_m4      |  10 +-
 databases/mysql/patches/patch-configure_in    |  38 ++--
 .../mysql/patches/patch-extra_resolveip_c     |  12 -
 .../mysql/patches/patch-include_m_ctype_h     |  44 +---
 .../patches/patch-innobase_include_univ_i     |   8 +-
 .../patches/patch-innobase_log_log0recv_c     |  30 ---
 .../patches/patch-mysql-test_Makefile_in      |  12 +-
 .../mysql/patches/patch-scripts_Makefile.in   |   8 +-
 .../patches/patch-scripts_mysql_install_db.sh |  69 +++---
 .../patches/patch-scripts_safe_mysqld.sh      | 102 ---------
 databases/mysql/patches/patch-sql_Makefile.in |  10 +-
 .../mysql/patches/patch-sql_item_strfunc_cc   |  13 --
 databases/mysql/patches/patch-sql_sql_acl_cc  |  16 --
 databases/mysql/pkg/DESCR-server              |   3 -
 databases/mysql/pkg/PFRAG.shared              |  10 +-
 databases/mysql/pkg/PLIST                     |  14 +-
 databases/mysql/pkg/PLIST-server              |  36 ++-
 databases/mysql/pkg/PLIST-tests               | 205 ++++++++++++++++--
 20 files changed, 348 insertions(+), 358 deletions(-)
 delete mode 100644 databases/mysql/patches/patch-extra_resolveip_c
 delete mode 100644 databases/mysql/patches/patch-innobase_log_log0recv_c
 delete mode 100644 databases/mysql/patches/patch-scripts_safe_mysqld.sh
 delete mode 100644 databases/mysql/patches/patch-sql_item_strfunc_cc
 delete mode 100644 databases/mysql/patches/patch-sql_sql_acl_cc

diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile
index d04bc7042dc..7732981e98c 100644
--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@@ -1,20 +1,18 @@
-# $OpenBSD: Makefile,v 1.87 2003/12/28 22:17:50 espie Exp $
-# $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $
+# $OpenBSD: Makefile,v 1.88 2003/12/30 05:57:30 brad Exp $
 # Uses pthreads
 
 COMMENT=	"multithreaded SQL database (client)"
 COMMENT-server=	"multithreaded SQL database (server)"
 COMMENT-tests=	"multithreaded SQL database (regression test suite)"
 
-VERSION=	3.23.57
+VERSION=	4.0.17
 DISTNAME=	mysql-${VERSION}
 FULLPKGNAME=	mysql-client-${VERSION}
-PKGNAME-server=	mysql-server-${VERSION}p1
+PKGNAME-server=	mysql-server-${VERSION}
 FULLPKGNAME-tests= mysql-tests-${VERSION}
 CATEGORIES=	databases
-V=		MySQL-3.23
-MASTER_SITES=	http://mysql.secsup.org/Downloads/$V/ \
-		http://mysql.mirrors.pair.com/Downloads/$V/
+V=		MySQL-4.0
+MASTER_SITES=	http://mysql.mirrors.pair.com/Downloads/$V/
 
 HOMEPAGE=	http://www.mysql.com/
 
@@ -30,62 +28,52 @@ DB_DIR?=	/var/mysql
 SOCKET_DIR=	/var/run/mysql
 SUBST_VARS=	DB_DIR SOCKET_DIR VERSION
 
-# Suggested flags to the C++ compiler, needed for
+# Suggested flags for the C compiler, needed for
 # high load servers otherwise MySQL will crash.
 CXX=		${CC}
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-exceptions -fno-rtti
 
+VMEM_WARNING=	Yes
+
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= autoconf
-AUTOCONF_NEW=	Yes
+AUTOCONF_VERSION= 2.54
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static \
+CONFIGURE_ARGS+= --enable-thread-safe-client \
 		 --localstatedir="${DB_DIR}" \
 		 --with-comment='OpenBSD port: ${FULLPKGNAME-server}' \
-		 --with-innodb \
-		 --with-libwrap="/usr" \
+		 --with-libwrap \
 		 --with-mysqld-user="_mysql" \
+		 --with-openssl \
 		 --with-unix-socket-path="${SOCKET_DIR}/mysql.sock" \
+		 --with-vio \
 		 --without-bench \
 		 --without-debug \
 		 --without-docs \
-		 --without-gemini \
-		 --without-mit-threads \
-		 --without-perl \
+		 --without-extra-tools \
 		 --without-readline
 
 .include <bsd.own.mk>
+
 USE_GCC3?= No
+
 .if ${USE_GCC3:L} == "yes"
 CONFIGURE_ARGS+= --with-client-ldflags=-lsupc++
-CONFIGURE_ARGS+= --with-mysqld-ldflags=-lsupc++
+		 --with-mysqld-ldflags=-lsupc++
 .endif
 
-CONFIGURE_ENV=	HOSTNAME="/bin/hostname -s"
-
-FLAVORS=	bdb
-FLAVOR?=
+. if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS+= --enable-assembler
+.endif
 
 MULTI_PACKAGES=	-server -tests
 SUBPACKAGE?=
 
-.if ${FLAVOR:L:Mbdb}
-. if ${MACHINE_ARCH} != "i386"
-BROKEN=		"The BerkeleyDB transaction support has not been tested on your architecture yet"
-. else
-CONFIGURE_ARGS+= --with-berkeley-db
-. endif
-.else
-CONFIGURE_ARGS+= --without-berkeley-db
-.endif
-
 .if ${SUBPACKAGE} == "-server"
-RUN_DEPENDS=	:mysql-client-3.23.*:databases/mysql \
+RUN_DEPENDS=	:mysql-client-4.0.*:databases/mysql \
 		:p5-DBD-Msql-Mysql-*:databases/p5-DBD-Msql-Mysql
 .endif
 
-VMEM_WARNING=	Yes
-
 DOCS=	manual.html manual.ps manual_toc.html manual.txt
 
 post-install:
@@ -93,10 +81,8 @@ post-install:
 	cd ${WRKSRC}/Docs; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/mysql
 	${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif \
 		${PREFIX}/share/doc/mysql/Flags
-	@if [ -f ${PREFIX}/lib/mysql/libmysqlclient.so.10.0 ]; then \
-	  cd ${PREFIX}/lib && ln -sf mysql/libmysqlclient.so.10.0 \
-		libmysqlclient.so.10.0 ;\
-	fi
+	cd ${PREFIX}/lib && ln -sf mysql/libmysqlclient.so.12.0 . && \
+		ln -sf mysql/libmysqlclient_r.so.12.0 .
 
 do-regress:
 	@cd ${WRKSRC}/mysql-test && ./mysql-test-run --force
diff --git a/databases/mysql/distinfo b/databases/mysql/distinfo
index 678e91ba3b6..7e870ad3a6e 100644
--- a/databases/mysql/distinfo
+++ b/databases/mysql/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-3.23.57.tar.gz) = 892f7d97af1ce7502e89d824031abd05
-RMD160 (mysql-3.23.57.tar.gz) = 600c5d6c055e3c1a225056c1dd9585e95b7e4387
-SHA1 (mysql-3.23.57.tar.gz) = 99c3643158ea03d8f96f1ea8acc2d02ab635cdae
+MD5 (mysql-4.0.17.tar.gz) = 141511e1b7cab3a886fb68bbb507a1ab
+RMD160 (mysql-4.0.17.tar.gz) = 555fcfb2fc555d81c4dc40a1bc33d0de78b85369
+SHA1 (mysql-4.0.17.tar.gz) = b2588d2ccc9d2683e874e7c5cb4d9c55c2196b9e
diff --git a/databases/mysql/patches/patch-aclocal_m4 b/databases/mysql/patches/patch-aclocal_m4
index 76117bb4036..674ec500a65 100644
--- a/databases/mysql/patches/patch-aclocal_m4
+++ b/databases/mysql/patches/patch-aclocal_m4
@@ -1,7 +1,7 @@
-$OpenBSD: patch-aclocal_m4,v 1.2 2003/08/26 15:37:18 brad Exp $
---- aclocal.m4.orig	Fri Jun  6 10:39:30 2003
-+++ aclocal.m4	Fri Jun 20 09:23:46 2003
-@@ -3321,7 +3321,7 @@ else
+$OpenBSD: patch-aclocal_m4,v 1.3 2003/12/30 05:57:30 brad Exp $
+--- aclocal.m4.orig	2003-12-14 16:24:00.000000000 -0500
++++ aclocal.m4	2003-12-21 01:53:42.000000000 -0500
+@@ -3570,7 +3570,7 @@ else
      hardcode_direct=yes
      hardcode_shlibpath_var=no
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -10,7 +10,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2003/08/26 15:37:18 brad Exp $
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        export_dynamic_flag_spec='${wl}-E'
      else
-@@ -3331,7 +3331,7 @@ else
+@@ -3580,7 +3580,7 @@ else
  	hardcode_libdir_flag_spec='-R$libdir'
          ;;
        *)
diff --git a/databases/mysql/patches/patch-configure_in b/databases/mysql/patches/patch-configure_in
index 0a5b323a6d6..7cfa11589f0 100644
--- a/databases/mysql/patches/patch-configure_in
+++ b/databases/mysql/patches/patch-configure_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.4 2003/08/26 15:37:18 brad Exp $
---- configure.in.orig	2003-06-06 10:39:17.000000000 -0400
-+++ configure.in	2003-08-24 17:08:11.000000000 -0400
-@@ -392,38 +392,7 @@ AC_SUBST(PERL5)
+$OpenBSD: patch-configure_in,v 1.5 2003/12/30 05:57:30 brad Exp $
+--- configure.in.orig	2003-12-14 16:23:49.000000000 -0500
++++ configure.in	2003-12-21 02:01:02.000000000 -0500
+@@ -432,41 +432,7 @@ AC_SUBST(PERL5)
  AC_PATH_PROG(PS, ps, ps)
  AC_MSG_CHECKING("how to check if pid exists")
  PS=$ac_cv_path_PS
@@ -33,6 +33,9 @@ $OpenBSD: patch-configure_in,v 1.4 2003/08/26 15:37:18 brad Exp $
 -    *cygwin*)
 -      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -      ;;
+-    *netware* | *modesto*)
+-      FIND_PROC=
+-      ;;
 -    *)
 -      AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
 -  esac
@@ -41,7 +44,7 @@ $OpenBSD: patch-configure_in,v 1.4 2003/08/26 15:37:18 brad Exp $
  AC_SUBST(FIND_PROC)
  AC_MSG_RESULT("$FIND_PROC")
  
-@@ -740,7 +709,8 @@ AC_ARG_WITH(libwrap,
+@@ -783,7 +749,8 @@ AC_ARG_WITH(libwrap,
      AC_CHECK_HEADER(tcpd.h,
        LIBS="-lwrap $LIBS"
        AC_MSG_CHECKING(for TCP wrappers library -lwrap)
@@ -51,29 +54,30 @@ $OpenBSD: patch-configure_in,v 1.4 2003/08/26 15:37:18 brad Exp $
  int allow_severity = 0;
  int deny_severity  = 0;
  
-@@ -940,6 +910,10 @@ case $SYSTEM_TYPE in
+@@ -1042,6 +1009,11 @@ case $SYSTEM_TYPE in
      CXXFLAGS="$CXXFLAGS -Dunix"
      OVERRIDE_MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
      ;;
 +  *openbsd*)
 +    echo "Adding fix for OpenBSD"
 +    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_REALPATH"
 +    ;;
    *bsdi*)
      echo "Adding fix for BSDI"
      CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"
-@@ -1305,7 +1279,7 @@ then
+@@ -1531,7 +1503,7 @@ then
    AC_CHECK_LIB(c_r,strtok_r)
    case "$with_osf32_threads---$target_os" in
      # Don't keep -lc_r in LIBS; -pthread handles it magically
--    yes---* | *---freebsd* ) LIBS="$my_save_LIBS" ;;
-+    yes---* | *---freebsd* | *---openbsd* ) LIBS="$my_save_LIBS" ;;
+-    yes---* | *---freebsd* | *---hpux*) LIBS="$my_save_LIBS" ;;
++    yes---* | *---freebsd* | *---openbsd* | *---hpux*) LIBS="$my_save_LIBS" ;;
+ 
    esac
    AC_CHECK_FUNCS(strtok_r pthread_init)
- else
-@@ -1327,29 +1301,6 @@ AC_SUBST(LIBDL)
- # System characteristics
- AC_SYS_RESTARTABLE_SYSCALLS
+@@ -1559,29 +1531,6 @@ AC_SYS_RESTARTABLE_SYSCALLS
+     ;;
+ esac
  
 -# Build optimized or debug version ?
 -# First check for gcc and g++
@@ -91,13 +95,13 @@ $OpenBSD: patch-configure_in,v 1.4 2003/08/26 15:37:18 brad Exp $
 -then
 -  DEBUG_CXXFLAGS="-g"
 -  DEBUG_OPTIMIZE_CXX="-O"
--  OPTIMIZE_CXXFLAGS="-O3"
+-  OPTIMIZE_CXXFLAGS="$MAX_CXX_OPTIMIZE"
 -else
 -  DEBUG_CXXFLAGS="-g"
 -  DEBUG_OPTIMIZE_CXX=""
 -  OPTIMIZE_CXXFLAGS="-O"
 -fi
 -
- AC_ARG_WITH(debug,
-     [  --without-debug         Build a production version without debugging code],
-     [with_debug=$withval],
+ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
+   DEBUG_CFLAGS="$DEBUG_CFLAGS -DDEBUG -sym internal,codeview4"
+   DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -DDEBUG -sym internal,codeview4"
diff --git a/databases/mysql/patches/patch-extra_resolveip_c b/databases/mysql/patches/patch-extra_resolveip_c
deleted file mode 100644
index d5265d2eda0..00000000000
--- a/databases/mysql/patches/patch-extra_resolveip_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-extra_resolveip_c,v 1.1 2003/08/26 15:37:18 brad Exp $
---- extra/resolveip.c.orig	2003-08-24 17:08:58.000000000 -0400
-+++ extra/resolveip.c	2003-08-24 17:09:19.000000000 -0400
-@@ -110,7 +110,7 @@ static int get_options(int *argc,char **
- int main(int argc, char **argv)
- {
-   struct hostent *hpaddr;
--  u_long taddr;
-+  in_addr_t taddr;
-   char *ip,**q;
-   int error=0;
- 
diff --git a/databases/mysql/patches/patch-include_m_ctype_h b/databases/mysql/patches/patch-include_m_ctype_h
index 8e02249d40a..a876adb6400 100644
--- a/databases/mysql/patches/patch-include_m_ctype_h
+++ b/databases/mysql/patches/patch-include_m_ctype_h
@@ -1,9 +1,9 @@
-$OpenBSD: patch-include_m_ctype_h,v 1.1 2001/09/10 02:59:35 brad Exp $
---- include/m_ctype.h.orig	Sat Sep  8 15:08:15 2001
-+++ include/m_ctype.h	Sun Sep  9 20:12:00 2001
-@@ -71,6 +71,15 @@ extern CHARSET_INFO  compiled_charsets[]
- #define __CTYPE_INCLUDED
- #define _CTYPE_USING   /* Don't put names in global namespace. */
+$OpenBSD: patch-include_m_ctype_h,v 1.2 2003/12/30 05:57:30 brad Exp $
+--- include/m_ctype.h.orig	2003-12-14 16:23:48.000000000 -0500
++++ include/m_ctype.h	2003-12-21 01:53:42.000000000 -0500
+@@ -89,6 +89,15 @@ extern const char *compiled_charset_name
+ #undef isascii
+ #undef toascii
  
 +#undef _U
 +#undef _L
@@ -16,34 +16,4 @@ $OpenBSD: patch-include_m_ctype_h,v 1.1 2001/09/10 02:59:35 brad Exp $
 +
  #define	_U	01	/* Upper case */
  #define	_L	02	/* Lower case */
- #define	_N	04	/* Numeral (digit) */
-@@ -86,11 +95,29 @@ extern CHARSET_INFO  compiled_charsets[]
- #define my_sort_order	(default_charset_info->sort_order)
- 
- #ifndef __WIN__
-+#undef _toupper
- #define	_toupper(c)	(char) my_to_upper[(uchar) (c)]
-+#undef _tolower
- #define	_tolower(c)	(char) my_to_lower[(uchar) (c)]
-+
-+#undef toupper
-+#undef tolower
- #define toupper(c)	(char) my_to_upper[(uchar) (c)]
- #define tolower(c)	(char) my_to_lower[(uchar) (c)]
- 
-+#undef isalpha
-+#undef isupper
-+#undef islower
-+#undef isdigit
-+#undef isxdigit
-+#undef isalnum
-+#undef isspace
-+#undef ispunct
-+#undef isprint
-+#undef isgraph
-+#undef iscntrl
-+#undef isascii
-+#undef toascii
- #define	isalpha(c)	((my_ctype+1)[(uchar) (c)] & (_U | _L))
- #define	isupper(c)	((my_ctype+1)[(uchar) (c)] & _U)
- #define	islower(c)	((my_ctype+1)[(uchar) (c)] & _L)
+ #define	_NMR	04	/* Numeral (digit) */
diff --git a/databases/mysql/patches/patch-innobase_include_univ_i b/databases/mysql/patches/patch-innobase_include_univ_i
index 08f806d6cd9..59f5a85b61d 100644
--- a/databases/mysql/patches/patch-innobase_include_univ_i
+++ b/databases/mysql/patches/patch-innobase_include_univ_i
@@ -1,7 +1,7 @@
-$OpenBSD: patch-innobase_include_univ_i,v 1.3 2003/08/26 15:37:18 brad Exp $
---- innobase/include/univ.i.orig	2003-06-06 10:39:16.000000000 -0400
-+++ innobase/include/univ.i	2003-08-24 17:08:11.000000000 -0400
-@@ -118,13 +118,9 @@ memory is read outside the allocated blo
+$OpenBSD: patch-innobase_include_univ_i,v 1.4 2003/12/30 05:57:30 brad Exp $
+--- innobase/include/univ.i.orig	2003-12-14 16:23:49.000000000 -0500
++++ innobase/include/univ.i	2003-12-21 01:53:42.000000000 -0500
+@@ -129,13 +129,9 @@ by one. */
  #define UNIV_INLINE  	__inline
  #else
  /* config.h contains the right def for 'inline' for the current compiler */
diff --git a/databases/mysql/patches/patch-innobase_log_log0recv_c b/databases/mysql/patches/patch-innobase_log_log0recv_c
deleted file mode 100644
index b68d9b5febd..00000000000
--- a/databases/mysql/patches/patch-innobase_log_log0recv_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-innobase_log_log0recv_c,v 1.1 2003/04/14 14:27:43 avsm Exp $
---- innobase/log/log0recv.c.orig	Mon Apr 14 13:50:44 2003
-+++ innobase/log/log0recv.c	Mon Apr 14 13:52:56 2003
-@@ -1381,7 +1381,7 @@ recv_apply_log_recs_for_backup(
- 							&success);
- 			if (!success) {
- 				printf(
--"InnoDB: Error: cannot open %lu'th data file %s\n", nth_file);
-+"InnoDB: Error: cannot open %lu'th data file %s\n", nth_file, data_files[nth_file]);
- 
- 				exit(1);
- 			}
-@@ -1398,7 +1398,7 @@ recv_apply_log_recs_for_backup(
- 			if (!success) {
- 				printf(
- "InnoDB: Error: cannot read page no %lu from %lu'th data file %s\n",
--				nth_page_in_file, nth_file);
-+				nth_page_in_file, nth_file, data_files[nth_file]);
- 
- 				exit(1);
- 			}
-@@ -1426,7 +1426,7 @@ recv_apply_log_recs_for_backup(
- 			if (!success) {
- 				printf(
- "InnoDB: Error: cannot write page no %lu to %lu'th data file %s\n",
--				nth_page_in_file, nth_file);
-+				nth_page_in_file, nth_file, data_files[nth_file]);
- 
- 				exit(1);
- 			}
diff --git a/databases/mysql/patches/patch-mysql-test_Makefile_in b/databases/mysql/patches/patch-mysql-test_Makefile_in
index becda19e82e..4d16b00dd47 100644
--- a/databases/mysql/patches/patch-mysql-test_Makefile_in
+++ b/databases/mysql/patches/patch-mysql-test_Makefile_in
@@ -1,9 +1,9 @@
-$OpenBSD: patch-mysql-test_Makefile_in,v 1.4 2002/12/14 23:56:43 brad Exp $
---- mysql-test/Makefile.in.orig	Thu Dec  5 04:37:23 2002
-+++ mysql-test/Makefile.in	Fri Dec 13 22:37:51 2002
-@@ -188,7 +188,7 @@ sql_server_dirs = @sql_server_dirs@
- thread_dirs = @thread_dirs@
- uname_prog = @uname_prog@
+$OpenBSD: patch-mysql-test_Makefile_in,v 1.5 2003/12/30 05:57:30 brad Exp $
+--- mysql-test/Makefile.in.orig	2003-12-14 16:24:03.000000000 -0500
++++ mysql-test/Makefile.in	2003-12-21 01:53:42.000000000 -0500
+@@ -205,7 +205,7 @@ uname_prog = @uname_prog@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
  
 -benchdir_root = $(prefix)
 +benchdir_root = $(datadir)
diff --git a/databases/mysql/patches/patch-scripts_Makefile.in b/databases/mysql/patches/patch-scripts_Makefile.in
index ce6ecd8f5b6..76e64cd8cb0 100644
--- a/databases/mysql/patches/patch-scripts_Makefile.in
+++ b/databases/mysql/patches/patch-scripts_Makefile.in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-scripts_Makefile.in,v 1.9 2002/12/14 23:56:43 brad Exp $
---- scripts/Makefile.in.orig	Thu Dec  5 04:37:24 2002
-+++ scripts/Makefile.in	Fri Dec 13 22:37:51 2002
-@@ -432,6 +432,7 @@ mysqlbug: ${top_builddir}/config.status 
+$OpenBSD: patch-scripts_Makefile.in,v 1.10 2003/12/30 05:57:30 brad Exp $
+--- scripts/Makefile.in.orig	2003-12-14 16:24:04.000000000 -0500
++++ scripts/Makefile.in	2003-12-21 01:53:42.000000000 -0500
+@@ -464,6 +464,7 @@ mysqlbug: ${top_builddir}/config.status 
  	  -e 's!@''datadir''@!$(datadir)!g' \
  	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
  	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
diff --git a/databases/mysql/patches/patch-scripts_mysql_install_db.sh b/databases/mysql/patches/patch-scripts_mysql_install_db.sh
index d62b423959a..3544f1b5e26 100644
--- a/databases/mysql/patches/patch-scripts_mysql_install_db.sh
+++ b/databases/mysql/patches/patch-scripts_mysql_install_db.sh
@@ -1,6 +1,6 @@
-$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.10 2003/08/27 00:14:49 brad Exp $
---- scripts/mysql_install_db.sh.orig	2003-06-06 10:39:19.000000000 -0400
-+++ scripts/mysql_install_db.sh	2003-08-26 19:17:20.000000000 -0400
+$OpenBSD: patch-scripts_mysql_install_db.sh,v 1.11 2003/12/30 05:57:30 brad Exp $
+--- scripts/mysql_install_db.sh.orig	2003-12-14 16:23:48.000000000 -0500
++++ scripts/mysql_install_db.sh	2003-12-21 02:22:02.000000000 -0500
 @@ -7,12 +7,9 @@
  #
  # All unrecognized arguments to this script are passed to mysqld.
@@ -26,10 +26,10 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.10 2003/08/27 00:14:49 brad Exp
        --ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
        --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
 +      --group=*) group=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+       --skip-name-resolve) ip_only=1 ;;
        *)
          if test -n "$pick_args"
-         then
-@@ -69,7 +66,6 @@ ldata=
+@@ -70,7 +67,6 @@ ldata=
  execdir=
  bindir=
  basedir=
@@ -37,26 +37,28 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.10 2003/08/27 00:14:49 brad Exp
  parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
  parse_arguments PICK-ARGS-FROM-ARGV "$@"
  
-@@ -96,53 +92,37 @@ mdata=$ldata/mysql
+@@ -97,43 +93,33 @@ mdata=$ldata/mysql
  
  if test ! -x $execdir/mysqld
  then
--  if test "$IN_RPM" -eq 1
+-  if test "$IN_RPM" = "1"
 -  then
 -    echo "FATAL ERROR $execdir/mysqld not found!"
 -    exit 1
 -  else
-     echo "Didn't find $execdir/mysqld"
-     echo "You should do a 'make install' before executing this script"
-     exit 1
+-    echo "Didn't find $execdir/mysqld"
+-    echo "You should do a 'make install' before executing this script"
+-    exit 1
 -  fi
++  echo "FATAL ERROR $execdir/mysqld not found!"
++  exit 1
  fi
  
--hostname=`@HOSTNAME@`		# Install this too in the user table
-+hostname=`hostname -s`		# Install this too in the user table
+ # Try to determine the hostname
+ hostname=`@HOSTNAME@`
  
  # Check if hostname is valid
--if test "$IN_RPM" -eq 0 -a $force -eq 0
+-if test "$IN_RPM" = "0" -a $force = "0"
 +resolved=`$bindir/resolveip $hostname 2>&1`
 +if [ $? -ne 0 ]
  then
@@ -68,7 +70,8 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.10 2003/08/27 00:14:49 brad Exp
 -    resolved=`$bindir/resolveip localhost 2>&1`
 -    if [ $? -eq 0 ]
 -    then
--      echo "Sorry, the host '$hostname' could not be looked up."
+-      echo "Neither host '$hostname' and 'localhost' could not be looked up with"
+-      echo "$bindir/resolveip"
 -      echo "Please configure the 'hostname' command to return a correct hostname."
 -      echo "If you want to solve this at a later stage, restart this script with"
 -      echo "the --force option"
@@ -76,44 +79,48 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.10 2003/08/27 00:14:49 brad Exp
 -    fi
 -    echo "WARNING: The host '$hostname' could not be looked up with resolveip."
 -    echo "This probably means that your libc libraries are not 100 % compatible"
--    echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
+-    echo "with this binary MySQL version. The MySQL daemon, mysqld, should work"
 -    echo "normally with the exception that host name resolving will not work."
 -    echo "This means that you should use IP addresses instead of hostnames"
 -    echo "when specifying MySQL privileges !"
-+    echo "Sorry, the host '$hostname' could not be looked up."
++    echo "Neither host '$hostname' and 'localhost' could not be looked up with"
++    echo "$bindir/resolveip"
 +    echo "Please configure the 'hostname' command to return a correct hostname."
++    echo "If you want to solve this at a later stage, restart this script with"
++    echo "the --force option"
 +    exit 1
    fi
 +  echo "WARNING: The host '$hostname' could not be looked up with resolveip."
 +  echo "This probably means that your libc libraries are not 100 % compatible"
-+  echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
++  echo "with this binary MySQL version. The MySQL daemon, mysqld, should work"
 +  echo "normally with the exception that host name resolving will not work."
 +  echo "This means that you should use IP addresses instead of hostnames"
 +  echo "when specifying MySQL privileges !"
  fi
  
+ if test "$ip_only" = "1"
+@@ -143,12 +129,10 @@ then
+ fi
+ 
  # Create database directories mysql & test
--if test "$IN_RPM" -eq 0
--then
 -  if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
 -  if test ! -d $ldata/mysql; then mkdir $ldata/mysql;  chmod 700 $ldata/mysql ; fi
 -  if test ! -d $ldata/test; then mkdir $ldata/test;  chmod 700 $ldata/test ; fi
 -  if test -w / -a ! -z "$user"; then
 -    chown $user $ldata $ldata/mysql $ldata/test;
 -  fi
--fi
-+if test ! -d $ldata; then mkdir -p $ldata; chmod 700 $ldata ; fi
-+if test ! -d $ldata/mysql; then mkdir -p $ldata/mysql;  chmod 700 $ldata/mysql ; fi
-+if test ! -d $ldata/test; then mkdir -p $ldata/test;  chmod 700 $ldata/test ; fi
-+chown $user:$group $ldata $ldata/mysql $ldata/test;
++  if test ! -d $ldata; then mkdir -p $ldata; chmod 700 $ldata ; fi
++  if test ! -d $ldata/mysql; then mkdir -p $ldata/mysql;  chmod 700 $ldata/mysql ; fi
++  if test ! -d $ldata/test; then mkdir -p $ldata/test;  chmod 700 $ldata/test ; fi
++  chown -f $user:group $ldata $ldata/mysql $ldata/test;
  
  # Initialize variables
  c_d="" i_d=""
-@@ -309,12 +289,6 @@ $c_c
+@@ -333,12 +317,6 @@ $c_c
  END_OF_DATA
  then
    echo ""
--  if test "$IN_RPM" -eq 0
+-  if test "$IN_RPM" = "0"
 -  then
 -    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
 -    echo "to the right place for your system"
@@ -121,18 +128,18 @@ $OpenBSD: patch-scripts_mysql_install_db.sh,v 1.10 2003/08/27 00:14:49 brad Exp
 -  fi
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo "This is done with:"
-   echo "$bindir/mysqladmin -u root  password 'new-password'"
-@@ -330,15 +304,6 @@ then
+   echo "$bindir/mysqladmin -u root password 'new-password'"
+@@ -354,15 +332,6 @@ then
      echo "able to use the new GRANT command!"
    fi
    echo
--  if test "$IN_RPM" -eq 0
+-  if test "$IN_RPM" = "0"
 -  then
 -    echo "You can start the MySQL daemon with:"
--    echo "cd @prefix@ ; $bindir/safe_mysqld &"
+-    echo "cd @prefix@ ; $bindir/mysqld_safe &"
 -    echo
 -    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
--    echo "cd sql-bench ; run-all-tests"
+-    echo "cd sql-bench ; perl run-all-tests"
 -    echo
 -  fi
    echo "Please report any problems with the @scriptdir@/mysqlbug script!"
diff --git a/databases/mysql/patches/patch-scripts_safe_mysqld.sh b/databases/mysql/patches/patch-scripts_safe_mysqld.sh
deleted file mode 100644
index cc29489bd8b..00000000000
--- a/databases/mysql/patches/patch-scripts_safe_mysqld.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-$OpenBSD: patch-scripts_safe_mysqld.sh,v 1.11 2003/08/27 00:14:49 brad Exp $
---- scripts/safe_mysqld.sh.orig	2003-06-06 10:39:17.000000000 -0400
-+++ scripts/safe_mysqld.sh	2003-08-26 19:17:34.000000000 -0400
-@@ -74,34 +74,16 @@ parse_arguments() {
-   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
-+MY_BASEDIR_VERSION=@prefix@
-+ledir=@libexecdir@
-+DATADIR=@localstatedir@
- 
- MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
- MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
--user=@MYSQLD_USER@
-+user=_mysql
-+group=_mysql
-+
-+socket_dir=`dirname $MYSQL_UNIX_PORT`
- 
- # Use the mysqld-max binary by default if the user doesn't specify a binary
- if test -x $ledir/mysqld-max
-@@ -232,10 +214,17 @@ fi
- echo "Starting $MYSQLD daemon with databases from $DATADIR"
- 
- # Does this work on all systems?
--#if type ulimit | grep "shell builtin" > /dev/null
--#then
--#  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
--#fi
-+if type ulimit | grep "shell builtin" > /dev/null
-+then
-+  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
-+fi
-+
-+if test ! -d $socket_dir
-+then
-+   mkdir -p $socket_dir
-+   chown $user:$group $socket_dir
-+   chmod 711 $socket_dir
-+fi
- 
- echo "`date +'%y%m%d %H:%M:%S  mysqld started'`" >> $err_log
- while true
-@@ -252,34 +241,6 @@ do
-     break
-   fi
- 
--  if @IS_LINUX@
--  then
--    # Test if one process was hanging.
--    # This is only a fix for Linux (running as base 3 mysqld processes)
--    # but should work for the rest of the servers.
--    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the process won't react on the kill.
--    numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
--    I=1
--    while test "$I" -le "$numofproces"
--    do 
--      PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` 
--	for T in $PROC
--	do
--	  break
--	done
--	#    echo "TEST $I - $T **"
--	if kill -9 $T
--	then
--	  echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
--	else 
--	  break
--	fi
--	I=`expr $I + 1`
--    done
--  fi
--
-   echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
- done
- 
diff --git a/databases/mysql/patches/patch-sql_Makefile.in b/databases/mysql/patches/patch-sql_Makefile.in
index 09c5dd34d8f..2c9a5a5c7f9 100644
--- a/databases/mysql/patches/patch-sql_Makefile.in
+++ b/databases/mysql/patches/patch-sql_Makefile.in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-sql_Makefile.in,v 1.15 2002/12/14 23:56:43 brad Exp $
---- sql/Makefile.in.orig	Thu Dec  5 04:37:24 2002
-+++ sql/Makefile.in	Fri Dec 13 22:37:51 2002
-@@ -816,8 +816,7 @@ sql_yacc.h:	sql_yacc.yy
+$OpenBSD: patch-sql_Makefile.in,v 1.16 2003/12/30 05:57:30 brad Exp $
+--- sql/Makefile.in.orig	2003-12-14 16:24:04.000000000 -0500
++++ sql/Makefile.in	2003-12-21 01:54:29.000000000 -0500
+@@ -842,8 +842,7 @@ sql_yacc.h:	sql_yacc.yy
  
  sql_yacc.o:	sql_yacc.cc sql_yacc.h
  		@echo "Note: The following compile may take a long time."
@@ -10,4 +10,4 @@ $OpenBSD: patch-sql_Makefile.in,v 1.15 2002/12/14 23:56:43 brad Exp $
 +		$(CXXCOMPILE) $(LM_CFLAGS) -O0 -c $<
  
  lex_hash.h:	lex.h gen_lex_hash.cc sql_yacc.h
- 		$(MAKE) gen_lex_hash
+ 		$(MAKE) gen_lex_hash$(EXEEXT)
diff --git a/databases/mysql/patches/patch-sql_item_strfunc_cc b/databases/mysql/patches/patch-sql_item_strfunc_cc
deleted file mode 100644
index cc5b762259f..00000000000
--- a/databases/mysql/patches/patch-sql_item_strfunc_cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-sql_item_strfunc_cc,v 1.1 2003/08/26 15:37:18 brad Exp $
---- sql/item_strfunc.cc.orig	2003-08-24 17:21:25.000000000 -0400
-+++ sql/item_strfunc.cc	2003-08-24 17:22:18.000000000 -0400
-@@ -1094,7 +1094,8 @@ String *Item_func_database::val_str(Stri
- String *Item_func_user::val_str(String *str)
- {
-   THD *thd=current_thd;
--  if (str->copy((const char*) thd->user,(uint) strlen(thd->user)) ||
-+  if (!(thd->user) || // for system threads (e.g. replication thread)
-+      str->copy((const char*) thd->user,(uint) strlen(thd->user)) ||
-       str->append('@') ||
-       str->append(thd->host ? thd->host : thd->ip ? thd->ip : ""))
-     return &empty_string;
diff --git a/databases/mysql/patches/patch-sql_sql_acl_cc b/databases/mysql/patches/patch-sql_sql_acl_cc
deleted file mode 100644
index 26d5a8130d7..00000000000
--- a/databases/mysql/patches/patch-sql_sql_acl_cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-sql_sql_acl_cc,v 1.1 2003/08/26 15:37:18 brad Exp $
---- sql/sql_acl.cc.orig	2003-08-24 17:10:08.000000000 -0400
-+++ sql/sql_acl.cc	2003-08-24 17:11:24.000000000 -0400
-@@ -206,10 +206,10 @@ int  acl_init(bool dont_read_acl_tables)
- 		      "Found old style password for user '%s'. Ignoring user. (You may want to restart using --old-protocol)",
- 		      user.user ? user.user : ""); /* purecov: tested */
-     }
--    else if (length % 8)		// This holds true for passwords
-+    else if (length % 8 || length > 16)
-     {
-       sql_print_error(
--		      "Found invalid password for user: '%s@%s'; Ignoring user",
-+		      "Found invalid password for user: '%s'@'%s'; Ignoring user",
- 		      user.user ? user.user : "",
- 		      user.host.hostname ? user.host.hostname : ""); /* purecov: tested */
-       continue; /* purecov: tested */
diff --git a/databases/mysql/pkg/DESCR-server b/databases/mysql/pkg/DESCR-server
index 0c20e2607c4..18ef0c71462 100644
--- a/databases/mysql/pkg/DESCR-server
+++ b/databases/mysql/pkg/DESCR-server
@@ -3,6 +3,3 @@ to mSQL.
 
 This is the server portion of MySQL, it provides the MySQL server as well 
 as various administrative binaries.
-
-Flavors:
-	bdb - Build with transaction support using BerkeleyDB
diff --git a/databases/mysql/pkg/PFRAG.shared b/databases/mysql/pkg/PFRAG.shared
index 34b74ef4d37..d3658059200 100644
--- a/databases/mysql/pkg/PFRAG.shared
+++ b/databases/mysql/pkg/PFRAG.shared
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2001/12/22 03:54:44 brad Exp $
-lib/libmysqlclient.so.10.0
-DYNLIBDIR(%B)
-lib/mysql/libmysqlclient.so.10.0
+@comment $OpenBSD: PFRAG.shared,v 1.6 2003/12/30 05:57:30 brad Exp $
+lib/libmysqlclient.so.12.0
+lib/libmysqlclient_r.so.12.0
+lib/mysql/libmysqlclient.so.12.0
+lib/mysql/libmysqlclient_r.so.12.0
+DYNLIBDIR(%D/lib)
diff --git a/databases/mysql/pkg/PLIST b/databases/mysql/pkg/PLIST
index b2da25072b0..41e4386e161 100644
--- a/databases/mysql/pkg/PLIST
+++ b/databases/mysql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.22 2003/08/26 15:37:18 brad Exp $
+@comment $OpenBSD: PLIST,v 1.23 2003/12/30 05:57:30 brad Exp $
 bin/mysql
 bin/mysqladmin
 bin/mysqlbinlog
@@ -6,30 +6,38 @@ bin/mysqlcheck
 bin/mysqldump
 bin/mysqldumpslow
 bin/mysqlimport
+bin/mysqlmanager-pwgen
+bin/mysqlmanagerc
 bin/mysqlshow
 bin/mysqltest
-include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_alloc.h
 include/mysql/my_config.h
+include/mysql/my_dbug.h
+include/mysql/my_dir.h
+include/mysql/my_getopt.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
+include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
+include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
-include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.la
 %%SHARED%%
 man/man1/mysql.1
 man/man1/mysqladmin.1
diff --git a/databases/mysql/pkg/PLIST-server b/databases/mysql/pkg/PLIST-server
index bbb978a9913..76cd1ceec2f 100644
--- a/databases/mysql/pkg/PLIST-server
+++ b/databases/mysql/pkg/PLIST-server
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST-server,v 1.6 2003/08/26 15:37:18 brad Exp $
+@comment $OpenBSD: PLIST-server,v 1.7 2003/12/30 05:57:30 brad Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
+@comment bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -9,21 +10,27 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_explain_log
 bin/mysql_find_rows
+bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
+bin/mysql_install
 bin/mysql_install_db
+bin/mysql_secure_installation
 bin/mysql_setpermission
+bin/mysql_tableinfo
+bin/mysql_waitpid
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqlbug
 bin/mysqld_multi
+bin/mysqld_safe
 bin/mysqlhotcopy
 bin/pack_isam
 bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
-bin/safe_mysqld
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -32,24 +39,29 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
+lib/mysql/libvio.a
 libexec/mysqld
 man/man1/isamchk.1
 man/man1/isamlog.1
+man/man1/mysql_fix_privilege_tables.1
 man/man1/mysql_zap.1
 man/man1/mysqlaccess.1
 man/man1/mysqld.1
 man/man1/mysqld_multi.1
+man/man1/mysqld_safe.1
 man/man1/perror.1
 man/man1/replace.1
-man/man1/safe_mysqld.1
 share/doc/mysql/Flags/argentina.gif
+share/doc/mysql/Flags/armenia.gif
 share/doc/mysql/Flags/australia.gif
 share/doc/mysql/Flags/austria.gif
+share/doc/mysql/Flags/belgium.gif
 share/doc/mysql/Flags/brazil.gif
 share/doc/mysql/Flags/bulgaria.gif
 share/doc/mysql/Flags/canada.gif
 share/doc/mysql/Flags/chile.gif
 share/doc/mysql/Flags/china.gif
+share/doc/mysql/Flags/costa-rica.gif
 share/doc/mysql/Flags/croatia.gif
 share/doc/mysql/Flags/czech-republic.gif
 share/doc/mysql/Flags/denmark.gif
@@ -63,25 +75,28 @@ share/doc/mysql/Flags/hungary.gif
 share/doc/mysql/Flags/iceland.gif
 share/doc/mysql/Flags/indonesia.gif
 share/doc/mysql/Flags/ireland.gif
-share/doc/mysql/Flags/island.gif
 share/doc/mysql/Flags/israel.gif
 share/doc/mysql/Flags/italy.gif
 share/doc/mysql/Flags/japan.gif
-share/doc/mysql/Flags/kroatia.gif
 share/doc/mysql/Flags/latvia.gif
+share/doc/mysql/Flags/mexico.gif
+share/doc/mysql/Flags/new-zealand.gif
 share/doc/mysql/Flags/netherlands.gif
+share/doc/mysql/Flags/norway.gif
+share/doc/mysql/Flags/philippines.gif
 share/doc/mysql/Flags/poland.gif
 share/doc/mysql/Flags/portugal.gif
 share/doc/mysql/Flags/romania.gif
 share/doc/mysql/Flags/russia.gif
 share/doc/mysql/Flags/singapore.gif
+share/doc/mysql/Flags/slovenia.gif
 share/doc/mysql/Flags/south-africa.gif
-share/doc/mysql/Flags/south-africa1.gif
 share/doc/mysql/Flags/south-korea.gif
 share/doc/mysql/Flags/spain.gif
 share/doc/mysql/Flags/sweden.gif
 share/doc/mysql/Flags/switzerland.gif
 share/doc/mysql/Flags/taiwan.gif
+share/doc/mysql/Flags/turkey.gif
 share/doc/mysql/Flags/ukraine.gif
 share/doc/mysql/Flags/usa.gif
 share/doc/mysql/Flags/yugoslavia.gif
@@ -89,6 +104,10 @@ share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
+@comment share/mysql/Description.plist
+@comment share/mysql/Info.plist
+@comment share/mysql/MySQL-shared-compat.spec
+@comment share/mysql/StartupParameters.plist
 share/mysql/binary-configure
 share/mysql/charsets/Index
 share/mysql/charsets/README
@@ -138,7 +157,8 @@ share/mysql/japanese/errmsg.sys
 share/mysql/japanese/errmsg.txt
 share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
-share/mysql/make_binary_distribution
+@comment share/mysql/make_binary_distribution
+@comment share/mysql/make_sharedlib_distribution
 share/mysql/mi_test_all
 share/mysql/mi_test_all.res
 share/mysql/my-huge.cnf
@@ -154,8 +174,10 @@ share/mysql/norwegian/errmsg.sys
 share/mysql/norwegian/errmsg.txt
 share/mysql/polish/errmsg.sys
 share/mysql/polish/errmsg.txt
+@comment share/mysql/postinstall
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
+@comment share/mysql/preinstall
 share/mysql/romanian/errmsg.sys
 share/mysql/romanian/errmsg.txt
 share/mysql/russian/errmsg.sys
diff --git a/databases/mysql/pkg/PLIST-tests b/databases/mysql/pkg/PLIST-tests
index ecbca78cea3..07785eb3908 100644
--- a/databases/mysql/pkg/PLIST-tests
+++ b/databases/mysql/pkg/PLIST-tests
@@ -1,15 +1,21 @@
-@comment $OpenBSD: PLIST-tests,v 1.4 2003/08/26 15:37:18 brad Exp $
+@comment $OpenBSD: PLIST-tests,v 1.5 2003/12/30 05:57:30 brad Exp $
 share/mysql-test/README
+share/mysql-test/include/check_var_limit.inc
 share/mysql-test/include/have_bdb.inc
-share/mysql-test/include/have_gemini.inc
+share/mysql-test/include/have_crypt.inc
 share/mysql-test/include/have_innodb.inc
 share/mysql-test/include/have_isam.inc
+share/mysql-test/include/have_openssl.inc
+share/mysql-test/include/have_openssl_1.inc
+share/mysql-test/include/have_query_cache.inc
 share/mysql-test/include/master-slave.inc
+share/mysql-test/include/not_embedded.inc
 share/mysql-test/install_test_db
 share/mysql-test/mysql-test-run
 share/mysql-test/r/alias.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
+share/mysql-test/r/ansi.result
 share/mysql-test/r/auto_increment.result
 share/mysql-test/r/backup.result
 share/mysql-test/r/bdb-alter-table-1.result
@@ -17,32 +23,50 @@ share/mysql-test/r/bdb-alter-table-2.result
 share/mysql-test/r/bdb-crash.result
 share/mysql-test/r/bdb-deadlock.result
 share/mysql-test/r/bdb.result
+share/mysql-test/r/bdb_cache.result
 share/mysql-test/r/bench_count_distinct.result
+share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
 share/mysql-test/r/binary.result
+share/mysql-test/r/bool.result
+share/mysql-test/r/bulk_replace.result
 share/mysql-test/r/case.result
+share/mysql-test/r/cast.result
 share/mysql-test/r/check.result
+share/mysql-test/r/check_var_limit.require
 share/mysql-test/r/comments.result
 share/mysql-test/r/compare.result
+share/mysql-test/r/constraints.result
+share/mysql-test/r/convert.result
 share/mysql-test/r/count_distinct.result
+share/mysql-test/r/count_distinct2.result
 share/mysql-test/r/create.result
+share/mysql-test/r/ctype_cp1251.result
+share/mysql-test/r/ctype_latin1_de.result
+share/mysql-test/r/ctype_ujis.result
 share/mysql-test/r/delayed.result
 share/mysql-test/r/delete.result
-share/mysql-test/r/dirty-close.result
+share/mysql-test/r/dirty_close.result
 share/mysql-test/r/distinct.result
 share/mysql-test/r/drop.result
+share/mysql-test/r/drop_temp_table.result
 share/mysql-test/r/empty_table.result
+share/mysql-test/r/errors.result
 share/mysql-test/r/explain.result
 share/mysql-test/r/flush.result
+share/mysql-test/r/foreign_key.result
 share/mysql-test/r/fulltext.result
 share/mysql-test/r/fulltext_cache.result
+share/mysql-test/r/fulltext_distinct.result
 share/mysql-test/r/fulltext_left_join.result
 share/mysql-test/r/fulltext_multi.result
 share/mysql-test/r/fulltext_order_by.result
 share/mysql-test/r/fulltext_update.result
+share/mysql-test/r/fulltext_var.result
 share/mysql-test/r/func_concat.result
 share/mysql-test/r/func_crypt.result
 share/mysql-test/r/func_date_add.result
+share/mysql-test/r/func_encrypt.result
 share/mysql-test/r/func_equal.result
 share/mysql-test/r/func_group.result
 share/mysql-test/r/func_if.result
@@ -60,21 +84,29 @@ share/mysql-test/r/func_test.result
 share/mysql-test/r/func_time.result
 share/mysql-test/r/func_timestamp.result
 share/mysql-test/r/gcc296.result
-share/mysql-test/r/gemini.result
+share/mysql-test/r/grant.result
+share/mysql-test/r/grant_cache.result
 share/mysql-test/r/group_by.result
+share/mysql-test/r/handler.result
 share/mysql-test/r/have_bdb.require
-share/mysql-test/r/have_gemini.require
+share/mysql-test/r/have_crypt.require
 share/mysql-test/r/have_innodb.require
 share/mysql-test/r/have_isam.require
+share/mysql-test/r/have_met_timezone.require
+share/mysql-test/r/have_openssl.require
+share/mysql-test/r/have_openssl_1.require
+share/mysql-test/r/have_query_cache.require
 share/mysql-test/r/have_raid.require
+share/mysql-test/r/have_symlink.require
 share/mysql-test/r/having.result
 share/mysql-test/r/heap.result
+share/mysql-test/r/innodb-deadlock.result
 share/mysql-test/r/innodb.result
-share/mysql-test/r/ins000001.result
+share/mysql-test/r/innodb_cache.result
+share/mysql-test/r/innodb_handler.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select.result
 share/mysql-test/r/isam.result
-share/mysql-test/r/isolation.result
 share/mysql-test/r/join.result
 share/mysql-test/r/join_crash.result
 share/mysql-test/r/join_outer.result
@@ -84,16 +116,35 @@ share/mysql-test/r/key_primary.result
 share/mysql-test/r/keywords.result
 share/mysql-test/r/kill.result
 share/mysql-test/r/limit.result
+share/mysql-test/r/loaddata.result
 share/mysql-test/r/lock.result
+share/mysql-test/r/lock_multi.result
+share/mysql-test/r/lock_tables_lost_commit.result
+share/mysql-test/r/lowercase_table.result
 share/mysql-test/r/merge.result
+share/mysql-test/r/mix_innodb_myisam_binlog.result
+share/mysql-test/r/multi_update.result
 share/mysql-test/r/myisam.result
+share/mysql-test/r/mysqlbinlog.result
+share/mysql-test/r/mysqldump.result
+share/mysql-test/r/not_embedded.require
 share/mysql-test/r/null.result
 share/mysql-test/r/null_key.result
 share/mysql-test/r/odbc.result
+share/mysql-test/r/olap.result
+share/mysql-test/r/openssl_1.result
+share/mysql-test/r/openssl_2.result
 share/mysql-test/r/order_by.result
+share/mysql-test/r/order_fill_sortbuf.result
+share/mysql-test/r/overflow.result
+share/mysql-test/r/packet.result
+share/mysql-test/r/query_cache.result
+share/mysql-test/r/query_cache_merge.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
 share/mysql-test/r/rename.result
+share/mysql-test/r/repair.result
+share/mysql-test/r/repair_part2.result
 share/mysql-test/r/replace.result
 share/mysql-test/r/rollback.result
 share/mysql-test/r/rpl000001.a.result
@@ -106,25 +157,44 @@ share/mysql-test/r/rpl000004.b.result
 share/mysql-test/r/rpl000004.result
 share/mysql-test/r/rpl000005.result
 share/mysql-test/r/rpl000006.result
-share/mysql-test/r/rpl000007.result
 share/mysql-test/r/rpl000008.result
 share/mysql-test/r/rpl000009.result
 share/mysql-test/r/rpl000010.result
 share/mysql-test/r/rpl000011.result
 share/mysql-test/r/rpl000012.result
 share/mysql-test/r/rpl000013.result
-share/mysql-test/r/rpl000014.result
 share/mysql-test/r/rpl000015.result
 share/mysql-test/r/rpl000017.result
 share/mysql-test/r/rpl000018.result
 share/mysql-test/r/rpl_alter.result
+share/mysql-test/r/rpl_chain_temp_table.result
+share/mysql-test/r/rpl_change_master.result
+share/mysql-test/r/rpl_do_grant.result
 share/mysql-test/r/rpl_empty_master_crash.result
+share/mysql-test/r/rpl_error_ignored_table.result
+share/mysql-test/r/rpl_failsafe.result
+share/mysql-test/r/rpl_flush_log_loop.result
 share/mysql-test/r/rpl_get_lock.result
+share/mysql-test/r/rpl_ignore_grant.result
 share/mysql-test/r/rpl_insert_id.result
+share/mysql-test/r/rpl_loaddata.result
+share/mysql-test/r/rpl_loaddata_rule_m.result
+share/mysql-test/r/rpl_loaddata_rule_s.result
+share/mysql-test/r/rpl_loaddatalocal.result
+share/mysql-test/r/rpl_log.result
+share/mysql-test/r/rpl_log_pos.result
+share/mysql-test/r/rpl_master_pos_wait.result
+share/mysql-test/r/rpl_max_relay_size.result
+share/mysql-test/r/rpl_multi_update.result
 share/mysql-test/r/rpl_mystery22.result
+share/mysql-test/r/rpl_redirect.result
+share/mysql-test/r/rpl_relayspace.result
+share/mysql-test/r/rpl_replicate_do.result
+share/mysql-test/r/rpl_reset_slave.result
 share/mysql-test/r/rpl_rotate_logs.result
 share/mysql-test/r/rpl_skip_error.result
 share/mysql-test/r/rpl_sporadic_master.result
+share/mysql-test/r/rpl_trunc_binlog.result
 share/mysql-test/r/sel000001.result
 share/mysql-test/r/sel000002.result
 share/mysql-test/r/sel000003.result
@@ -133,13 +203,16 @@ share/mysql-test/r/sel000032.result
 share/mysql-test/r/sel000033.result
 share/mysql-test/r/sel000100.result
 share/mysql-test/r/select.result
+share/mysql-test/r/select_found.result
 share/mysql-test/r/select_safe.result
 share/mysql-test/r/show_check.result
 share/mysql-test/r/slave-running.result
 share/mysql-test/r/slave-stopped.result
 share/mysql-test/r/status.result
+share/mysql-test/r/symlink.result
 share/mysql-test/r/tablelock.result
 share/mysql-test/r/temp_table.result
+share/mysql-test/r/timezone.result
 share/mysql-test/r/truncate.result
 share/mysql-test/r/type_blob.result
 share/mysql-test/r/type_date.result
@@ -153,52 +226,83 @@ share/mysql-test/r/type_time.result
 share/mysql-test/r/type_timestamp.result
 share/mysql-test/r/type_uint.result
 share/mysql-test/r/type_year.result
+share/mysql-test/r/union.result
 share/mysql-test/r/update.result
 share/mysql-test/r/user_var.result
 share/mysql-test/r/varbinary.result
 share/mysql-test/r/variables.result
-share/mysql-test/std_data/gemini.dat
+share/mysql-test/r/warnings.result
+share/mysql-test/std_data/des_key_file
+share/mysql-test/std_data/loaddata1.dat
+share/mysql-test/std_data/loaddata2.dat
+share/mysql-test/std_data/loaddata3.dat
+share/mysql-test/std_data/loaddata4.dat
+share/mysql-test/std_data/rpl_loaddata.dat
+share/mysql-test/std_data/rpl_loaddata2.dat
 share/mysql-test/std_data/words.dat
 share/mysql-test/t/alias.test
 share/mysql-test/t/alter_table.test
 share/mysql-test/t/analyse.test
+share/mysql-test/t/ansi-master.opt
+share/mysql-test/t/ansi.test
 share/mysql-test/t/auto_increment.test
 share/mysql-test/t/backup-master.sh
 share/mysql-test/t/backup.test
 share/mysql-test/t/bdb-alter-table-1.test
+share/mysql-test/t/bdb-alter-table-2-master.opt
 share/mysql-test/t/bdb-alter-table-2.test
 share/mysql-test/t/bdb-crash.test
 share/mysql-test/t/bdb-deadlock.test
 share/mysql-test/t/bdb.test
+share/mysql-test/t/bdb_cache-master.opt
+share/mysql-test/t/bdb_cache.test
 share/mysql-test/t/bench_count_distinct.test
 share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
+share/mysql-test/t/bool.test
+share/mysql-test/t/bulk_replace.test
 share/mysql-test/t/case.test
+share/mysql-test/t/cast.test
 share/mysql-test/t/check.test
 share/mysql-test/t/comments.test
 share/mysql-test/t/compare.test
+share/mysql-test/t/constraints.test
+share/mysql-test/t/convert.test
 share/mysql-test/t/count_distinct.test
+share/mysql-test/t/count_distinct2-master.opt
+share/mysql-test/t/count_distinct2.test
 share/mysql-test/t/create.test
+share/mysql-test/t/ctype_cp1251-master.opt
+share/mysql-test/t/ctype_cp1251.test
+share/mysql-test/t/ctype_latin1_de-master.opt
+share/mysql-test/t/ctype_latin1_de.test
+share/mysql-test/t/ctype_ujis-master.opt
+share/mysql-test/t/ctype_ujis.test
 share/mysql-test/t/delayed.test
 share/mysql-test/t/delete.test
-share/mysql-test/t/dirty-close.test
+share/mysql-test/t/dirty_close.test
 share/mysql-test/t/distinct.test
 share/mysql-test/t/drop.test
+share/mysql-test/t/drop_temp_table.test
 share/mysql-test/t/empty_table.test
-share/mysql-test/t/err000001.test
+share/mysql-test/t/errors.test
 share/mysql-test/t/explain.test
 share/mysql-test/t/flush.test
 share/mysql-test/t/flush_table.test
 share/mysql-test/t/foreign_key.test
 share/mysql-test/t/fulltext.test
 share/mysql-test/t/fulltext_cache.test
+share/mysql-test/t/fulltext_distinct.test
 share/mysql-test/t/fulltext_left_join.test
 share/mysql-test/t/fulltext_multi.test
 share/mysql-test/t/fulltext_order_by.test
 share/mysql-test/t/fulltext_update.test
+share/mysql-test/t/fulltext_var.test
 share/mysql-test/t/func_concat.test
 share/mysql-test/t/func_crypt.test
 share/mysql-test/t/func_date_add.test
+share/mysql-test/t/func_encrypt-master.opt
+share/mysql-test/t/func_encrypt.test
 share/mysql-test/t/func_equal.test
 share/mysql-test/t/func_group.test
 share/mysql-test/t/func_if.test
@@ -216,16 +320,21 @@ share/mysql-test/t/func_test.test
 share/mysql-test/t/func_time.test
 share/mysql-test/t/func_timestamp.test
 share/mysql-test/t/gcc296.test
-share/mysql-test/t/gemini.test
+share/mysql-test/t/grant.test
+share/mysql-test/t/grant_cache-master.opt
+share/mysql-test/t/grant_cache.test
 share/mysql-test/t/group_by.test
+share/mysql-test/t/handler.test
 share/mysql-test/t/having.test
 share/mysql-test/t/heap.test
+share/mysql-test/t/innodb-deadlock.test
 share/mysql-test/t/innodb.test
-share/mysql-test/t/ins000001.test
+share/mysql-test/t/innodb_cache-master.opt
+share/mysql-test/t/innodb_cache.test
+share/mysql-test/t/innodb_handler.test
 share/mysql-test/t/insert.test
 share/mysql-test/t/insert_select.test
 share/mysql-test/t/isam.test
-share/mysql-test/t/isolation.test
 share/mysql-test/t/join.test
 share/mysql-test/t/join_crash.test
 share/mysql-test/t/join_outer.test
@@ -235,18 +344,40 @@ share/mysql-test/t/key_primary.test
 share/mysql-test/t/keywords.test
 share/mysql-test/t/kill.test
 share/mysql-test/t/limit.test
+share/mysql-test/t/loaddata.test
 share/mysql-test/t/lock.test
+share/mysql-test/t/lock_multi.test
+share/mysql-test/t/lock_tables_lost_commit-master.opt
+share/mysql-test/t/lock_tables_lost_commit.test
+share/mysql-test/t/lowercase_table-master.opt
+share/mysql-test/t/lowercase_table.test
 share/mysql-test/t/merge.test
+share/mysql-test/t/mix_innodb_myisam_binlog.test
+share/mysql-test/t/multi_update-master.opt
+share/mysql-test/t/multi_update.test
 share/mysql-test/t/myisam.test
+share/mysql-test/t/mysqlbinlog-master.opt
+share/mysql-test/t/mysqlbinlog.test
+share/mysql-test/t/mysqldump.test
 share/mysql-test/t/null.test
 share/mysql-test/t/null_key.test
 share/mysql-test/t/odbc.test
+share/mysql-test/t/olap.test
+share/mysql-test/t/openssl_1.test
 share/mysql-test/t/order_by.test
+share/mysql-test/t/order_fill_sortbuf-master.opt
+share/mysql-test/t/order_fill_sortbuf.test
 share/mysql-test/t/outfile.test
 share/mysql-test/t/overflow.test
+share/mysql-test/t/packet.test
+share/mysql-test/t/query_cache.test
+share/mysql-test/t/query_cache_merge.test
 share/mysql-test/t/raid.test
 share/mysql-test/t/range.test
 share/mysql-test/t/rename.test
+share/mysql-test/t/repair.test
+share/mysql-test/t/repair_part2-master.sh
+share/mysql-test/t/repair_part2.test
 share/mysql-test/t/replace.test
 share/mysql-test/t/rollback.test
 share/mysql-test/t/rpl000001.test
@@ -255,8 +386,6 @@ share/mysql-test/t/rpl000003.test
 share/mysql-test/t/rpl000004.test
 share/mysql-test/t/rpl000005.test
 share/mysql-test/t/rpl000006.test
-share/mysql-test/t/rpl000007-slave.opt
-share/mysql-test/t/rpl000007.test
 share/mysql-test/t/rpl000008-slave.opt
 share/mysql-test/t/rpl000008.test
 share/mysql-test/t/rpl000009-slave.opt
@@ -267,22 +396,53 @@ share/mysql-test/t/rpl000011.test
 share/mysql-test/t/rpl000012.test
 share/mysql-test/t/rpl000013-slave.opt
 share/mysql-test/t/rpl000013.test
-share/mysql-test/t/rpl000014.test
 share/mysql-test/t/rpl000015-slave.sh
 share/mysql-test/t/rpl000015.slave-mi
 share/mysql-test/t/rpl000015.test
+share/mysql-test/t/rpl000016-slave.opt
 share/mysql-test/t/rpl000017-slave.opt
 share/mysql-test/t/rpl000017-slave.sh
 share/mysql-test/t/rpl000017.test
 share/mysql-test/t/rpl000018-master.opt
-share/mysql-test/t/rpl000018-master.sh
 share/mysql-test/t/rpl000018-slave.opt
 share/mysql-test/t/rpl000018.test
 share/mysql-test/t/rpl_alter.test
+share/mysql-test/t/rpl_chain_temp_table.test
+share/mysql-test/t/rpl_change_master.test
+share/mysql-test/t/rpl_do_grant.test
 share/mysql-test/t/rpl_empty_master_crash.test
+share/mysql-test/t/rpl_error_ignored_table-slave.opt
+share/mysql-test/t/rpl_error_ignored_table.test
+share/mysql-test/t/rpl_failsafe.test
+share/mysql-test/t/rpl_flush_log_loop-master.opt
+share/mysql-test/t/rpl_flush_log_loop-master.sh
+share/mysql-test/t/rpl_flush_log_loop-slave.opt
+share/mysql-test/t/rpl_flush_log_loop-slave.sh
+share/mysql-test/t/rpl_flush_log_loop.test
 share/mysql-test/t/rpl_get_lock.test
+share/mysql-test/t/rpl_ignore_grant-slave.opt
+share/mysql-test/t/rpl_ignore_grant.test
 share/mysql-test/t/rpl_insert_id.test
+share/mysql-test/t/rpl_loaddata.test
+share/mysql-test/t/rpl_loaddata_rule_m-master.opt
+share/mysql-test/t/rpl_loaddata_rule_m.test
+share/mysql-test/t/rpl_loaddata_rule_s-slave.opt
+share/mysql-test/t/rpl_loaddata_rule_s.test
+share/mysql-test/t/rpl_loaddatalocal.test
+share/mysql-test/t/rpl_log-master.opt
+share/mysql-test/t/rpl_log-slave.opt
+share/mysql-test/t/rpl_log.test
+share/mysql-test/t/rpl_log_pos.test
+share/mysql-test/t/rpl_master_pos_wait.test
+share/mysql-test/t/rpl_max_relay_size.test
+share/mysql-test/t/rpl_multi_update.test
 share/mysql-test/t/rpl_mystery22.test
+share/mysql-test/t/rpl_redirect.test
+share/mysql-test/t/rpl_relayspace-slave.opt
+share/mysql-test/t/rpl_relayspace.test
+share/mysql-test/t/rpl_replicate_do-slave.opt
+share/mysql-test/t/rpl_replicate_do.test
+share/mysql-test/t/rpl_reset_slave.test
 share/mysql-test/t/rpl_rotate_logs-master.opt
 share/mysql-test/t/rpl_rotate_logs-slave.sh
 share/mysql-test/t/rpl_rotate_logs.slave-mi
@@ -291,6 +451,7 @@ share/mysql-test/t/rpl_skip_error-slave.opt
 share/mysql-test/t/rpl_skip_error.test
 share/mysql-test/t/rpl_sporadic_master-master.opt
 share/mysql-test/t/rpl_sporadic_master.test
+share/mysql-test/t/rpl_trunc_binlog.test
 share/mysql-test/t/sel000001.test
 share/mysql-test/t/sel000002.test
 share/mysql-test/t/sel000003.test
@@ -299,11 +460,15 @@ share/mysql-test/t/sel000032.test
 share/mysql-test/t/sel000033.test
 share/mysql-test/t/sel000100.test
 share/mysql-test/t/select.test
+share/mysql-test/t/select_found.test
 share/mysql-test/t/select_safe.test
 share/mysql-test/t/show_check.test
 share/mysql-test/t/status.test
+share/mysql-test/t/symlink.test
 share/mysql-test/t/tablelock.test
 share/mysql-test/t/temp_table.test
+share/mysql-test/t/timezone-master.opt
+share/mysql-test/t/timezone.test
 share/mysql-test/t/truncate.test
 share/mysql-test/t/type_blob.test
 share/mysql-test/t/type_date.test
@@ -317,9 +482,11 @@ share/mysql-test/t/type_time.test
 share/mysql-test/t/type_timestamp.test
 share/mysql-test/t/type_uint.test
 share/mysql-test/t/type_year.test
+share/mysql-test/t/union.test
 share/mysql-test/t/update.test
 share/mysql-test/t/user_var.test
 share/mysql-test/t/varbinary.test
+share/mysql-test/t/variables-master.opt
 share/mysql-test/t/variables.test
 share/mysql-test/t/warnings.test
 @dirrm share/mysql-test/t