Re-add mysql4 packages.

Andreas Hallmann graciously agreed to maintain them.

46 files changed, 2506 insertions, 1 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 55b4e118613..755bceded77 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.240 2008/03/25 13:42:51 wiz Exp $
+# $NetBSD: Makefile,v 1.241 2008/03/26 13:22:00 wiz Exp $
 #
 
 COMMENT=	Databases
@@ -47,6 +47,8 @@ SUBDIR+=	luma
 SUBDIR+=	mergeant
 SUBDIR+=	metakit-lib
 SUBDIR+=	myodbc
+SUBDIR+=	mysql4-client
+SUBDIR+=	mysql4-server
 SUBDIR+=	mysql5-client
 SUBDIR+=	mysql5-server
 SUBDIR+=	mysqlcc
diff --git a/databases/mysql4-client/DESCR b/databases/mysql4-client/DESCR
new file mode 100644
index 00000000000..23500c3f7ba
--- /dev/null
+++ b/databases/mysql4-client/DESCR
@@ -0,0 +1,15 @@
+MySQL is a SQL (Structured Query Language) database server.  SQL is the
+most popular database language in the world.  MySQL is a client-server
+implementation that consists of a server daemon `mysqld' and many
+different client programs/libraries.
+
+The main goals of MySQL are speed and robustness.
+
+The base upon which MySQL is built is a set of routines that have been
+used in a highly demanding production environment for many years.  While
+MySQL is still in development it already offers a rich and highly useful
+function set.
+
+The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
+
+This package contains the MySQL client programs and libraries.
diff --git a/databases/mysql4-client/MESSAGE b/databases/mysql4-client/MESSAGE
new file mode 100644
index 00000000000..2b939d7337a
--- /dev/null
+++ b/databases/mysql4-client/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+To use the ``mysqlhotcopy'' script, you'll have to install the following
+packages:
+
+	databases/p5-DBD-mysql
+	devel/p5-File-Temp
+
+===========================================================================
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
new file mode 100644
index 00000000000..dea9cbcf21f
--- /dev/null
+++ b/databases/mysql4-client/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.28 2008/03/26 13:22:00 wiz Exp $
+
+PKGNAME=		${DISTNAME:S/-/-client-/}
+PKGREVISION=		3
+SVR4_PKGNAME=		mysqc
+COMMENT=		MySQL 4, a free SQL database (client)
+
+CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "Makefile.common"
+
+CONFIGURE_ARGS+=	--without-extra-tools
+CONFIGURE_ARGS+=	--without-server
+CONFIGURE_ARGS+=	--enable-thread-safe-client
+UNWRAP_FILES=		scripts/mysql_config
+INFO_FILES=		# PLIST
+
+INSTALLATION_DIRS=	${PKGINFODIR}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info \
+		${DESTDIR}${PREFIX}/${PKGINFODIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/mysql
+.for f in huge large innodb-heavy-4G small medium
+	${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
+		${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
+.endfor
+
+# We need the full readline on NetBSD<2.0.
+INCOMPAT_READLINE+=	NetBSD-[0-1].*-*
+.include "../../devel/readline/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
new file mode 100644
index 00000000000..f7681558e5d
--- /dev/null
+++ b/databases/mysql4-client/Makefile.common
@@ -0,0 +1,113 @@
+# $NetBSD: Makefile.common,v 1.64 2008/03/26 13:22:00 wiz Exp $
+
+DISTNAME=		mysql-4.1.22
+CATEGORIES=		databases
+MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-4.1/}
+
+MAINTAINER=		hallmann@ahatec.de
+HOMEPAGE=		http://www.mysql.com/
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+EXTRACT_USING=		pax
+
+# MYSQL_USER		username of the database administrator
+# MYSQL_GROUP		group of the database administrator
+# MYSQL_DATADIR		home directory of the database administrator and
+#			location of the databases
+MYSQL_USER?=		mysql
+MYSQL_GROUP?=		mysql
+MYSQL_DATADIR?=		${VARBASE}/mysql
+
+PKG_USERS_VARS+=	MYSQL_USER
+PKG_GROUPS_VARS+=	MYSQL_GROUP
+
+# MYSQL_CHARSET		default character set
+# MYSQL_EXTRA_CHARSET	additional character set to be compiled in.
+#
+MYSQL_CHARSET?=		latin1
+MYSQL_EXTRA_CHARSET?=	all
+
+CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR:Q}
+CONFIGURE_ARGS+=	--with-named-z-libs=z
+CONFIGURE_ARGS+=	--without-libwrap
+
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
+CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
+# libgen is incorrectly detected
+CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
+.endif
+
+# We always use our own readline.  Note that these --without-* settings
+# are confusing, but they just mean "don't use the included readline
+# or libedit".
+#
+CONFIGURE_ARGS+=	--without-readline
+CONFIGURE_ARGS+=	--without-libedit
+
+# This forces mysql.info _not_ to be rebuilt.
+CONFIGURE_ARGS+=	--without-docs
+
+# Speed up production one-time builds; see "./configure --help" for
+# more information on using or disabling this option.
+CONFIGURE_ARGS+=	--disable-dependency-tracking
+
+CONFIGURE_ARGS+=	--without-debug
+CONFIGURE_ARGS+=	--without-bench
+CONFIGURE_ARGS+=	--with-low-memory
+CONFIGURE_ARGS+=	--with-vio
+
+CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET:Q}
+CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
+
+.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \
+	${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+=	--enable-assembler
+.endif
+
+# Avoid an ICE in gcc2 on sparc64
+CONFIGURE_ENV+=		F77=${FALSE:Q}
+
+CPPFLAGS+=		-Dunix
+CFLAGS+=		-DUSE_OLD_FUNCTIONS # 3.23.x compat
+
+# force HAVE_CURSES_H on Solaris since the configure script is broken
+# and does not properly detect this, breaking the build later on.
+.if ${OPSYS} == "SunOS"
+CFLAGS+=		-DHAVE_CURSES_H
+CXXFLAGS+=		-DHAVE_CURSES_H
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+CFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CXXFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
+CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
+.endif
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake perl:run
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
+
+SUBST_CLASSES+=		mk scripts
+SUBST_STAGE.mk=		post-extract
+SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
+			merge/Makefile.in mysys/Makefile.in \
+			strings/Makefile.in
+SUBST_SED.mk=		-e "/^install-exec:/s/install-pkglibLIBRARIES//"
+SUBST_MESSAGE.mk=	Fixing Makefiles.
+SUBST_STAGE.scripts=	post-extract
+SUBST_FILES.scripts=	scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
+			scripts/mysql_secure_installation.sh \
+			support-files/mysql.server.sh
+SUBST_SED.scripts=	-e "s,chown,${CHOWN},g" \
+			-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
+SUBST_MESSAGE.scripts=	Fixing scripts.
+
+.include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
new file mode 100644
index 00000000000..166dd17912b
--- /dev/null
+++ b/databases/mysql4-client/PLIST
@@ -0,0 +1,79 @@
+@comment $NetBSD: PLIST,v 1.16 2008/03/26 13:22:00 wiz Exp $
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
+bin/mysql_create_system_tables
+bin/mysql_explain_log
+bin/mysql_find_rows
+bin/mysql_fix_privilege_tables
+bin/mysql_setpermission
+bin/mysql_tableinfo
+bin/mysql_zap
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlbug
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlmanager-pwgen
+bin/mysqlmanagerc
+bin/mysqlshow
+bin/mysqltest
+include/mysql/errmsg.h
+include/mysql/keycache.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/my_xml.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_embed.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
+include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-vars.h
+include/mysql/typelib.h
+info/mysql.info
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient_r.la
+man/man1/msql2mysql.1
+man/man1/mysql.1
+man/man1/mysql_config.1
+man/man1/mysql_fix_privilege_tables.1
+man/man1/mysql_zap.1
+man/man1/mysqlaccess.1
+man/man1/mysqladmin.1
+man/man1/mysqlbinlog.1
+man/man1/mysqlcheck.1
+man/man1/mysqldump.1
+man/man1/mysqlshow.1
+share/examples/mysql/my-huge.cnf
+share/examples/mysql/my-innodb-heavy-4G.cnf
+share/examples/mysql/my-large.cnf
+share/examples/mysql/my-medium.cnf
+share/examples/mysql/my-small.cnf
+share/mysql/fill_help_tables.sql
+share/mysql/mysql_fix_privilege_tables.sql
+@dirrm share/mysql
+@dirrm share/examples/mysql
+@dirrm lib/mysql
+@dirrm include/mysql
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
new file mode 100644
index 00000000000..b2e16611dfb
--- /dev/null
+++ b/databases/mysql4-client/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.23 2008/03/26 13:22:00 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	mysql-client
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
+BUILDLINK_PACKAGES+=	mysql-client
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client
+
+.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.22<5
+BUILDLINK_ABI_DEPENDS.mysql-client?=	mysql-client>=4.1.22nb1
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
+BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
+BUILDLINK_INCDIRS.mysql-client?=	include/mysql
+.endif	# MYSQL_CLIENT_BUILDLINK3_MK
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
new file mode 100644
index 00000000000..81ce1874015
--- /dev/null
+++ b/databases/mysql4-client/distinfo
@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.31 2008/03/26 13:22:00 wiz Exp $
+
+SHA1 (mysql-4.1.22.tar.gz) = 857e942cc3207caf56e2aa48961fc1ed66d932e6
+RMD160 (mysql-4.1.22.tar.gz) = bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e
+Size (mysql-4.1.22.tar.gz) = 17761101 bytes
+SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (patch-ab) = ca126aec7649dbe12663df30fc2223e256df5883
+SHA1 (patch-af) = 0164d5c00600720591cae36b71625660cdb97625
+SHA1 (patch-av) = e1578d1e9742a8317565986bd6ae9a38e0dd5fad
+SHA1 (patch-aw) = 35b3aafe923d44d287abd9d30b2a39b347386102
+SHA1 (patch-ax) = 719c1fdd38f494d097c9340f77e1c3264e084b8c
+SHA1 (patch-ay) = 3edcdd5b6e5a3d9e87f4fc83ff91dfebbeaf3b61
+SHA1 (patch-ba) = 73f89008fc6a1f37c573dce00fdde3965234e211
+SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
+SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
+SHA1 (patch-bd) = 32186a1f75d25f4feb95ba9d934dfcb526882681
+SHA1 (patch-be) = 977348504adeea29afb211cf0da8aa42e9c096d9
+SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927
diff --git a/databases/mysql4-client/options.mk b/databases/mysql4-client/options.mk
new file mode 100644
index 00000000000..6d5f8272670
--- /dev/null
+++ b/databases/mysql4-client/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql4-client
+
+PKG_SUPPORTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Enable OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.	include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+.else
+CONFIGURE_ARGS+=	--without-openssl
+.endif
diff --git a/databases/mysql4-client/patches/patch-aa b/databases/mysql4-client/patches/patch-aa
new file mode 100644
index 00000000000..54b7913904a
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+--- mysys/my_gethwaddr.c.orig	2005-10-14 10:21:10.000000000 +0000
++++ mysys/my_gethwaddr.c
+@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
+   return res;
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <net/ethernet.h>
+ #include <sys/sysctl.h>
diff --git a/databases/mysql4-client/patches/patch-ab b/databases/mysql4-client/patches/patch-ab
new file mode 100644
index 00000000000..ffa9ab04e76
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- sql/mysqld.cc.orig	2006-11-03 04:15:29.000000000 +0200
++++ sql/mysqld.cc	2007-05-23 08:20:22.000000000 +0300
+@@ -183,7 +183,7 @@
+ int initgroups(const char *,unsigned int);
+ #endif
+ 
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
+ #include <ieeefp.h>
+ #ifdef HAVE_FP_EXCEPT				// Fix type conflict
+ typedef fp_except fp_except_t;
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
new file mode 100644
index 00000000000..b5c91a06aed
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-af
@@ -0,0 +1,73 @@
+$NetBSD: patch-af,v 1.11 2008/03/26 13:22:00 wiz Exp $
+
+--- configure.orig	2006-11-03 04:19:18.000000000 +0200
++++ configure	2007-05-23 08:20:46.000000000 +0300
+@@ -20547,7 +20547,7 @@
+   FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
+ else
+   case $SYSTEM_TYPE in
+-    *freebsd*)
++    *freebsd* | *dragonfly*)
+       FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
+       ;;
+     *darwin*)
+@@ -24736,6 +24736,10 @@
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
++  *dragonfly*)
++    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    ;;
++    
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
+@@ -36636,30 +36640,10 @@
+ fi;
+ 
+ 
+-echo "$as_me:$LINENO: checking for ORBit" >&5
+-echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
+-orbit_config_path=`which orbit-config`
+-if test -n "$orbit_config_path" -a $? = 0
+-then
+-  orbit_exec_prefix=`orbit-config --exec-prefix`
+-  orbit_includes=`orbit-config --cflags server`
+-  orbit_libs=`orbit-config --libs server`
+-  orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
+-  echo "$as_me:$LINENO: result: found!" >&5
+-echo "${ECHO_T}found!" >&6
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ORBIT 1
+-_ACEOF
+-
+-else
+   orbit_exec_prefix=
+   orbit_includes=
+   orbit_libs=
+   orbit_idl=
+-  echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-fi
+ 
+ 
+ 
+@@ -36954,7 +36938,7 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
++#bench_dirs="$bench_dirs mysql-test"
+ 
+ 
+ # Don't build readline, i have it already
+@@ -37071,7 +37055,7 @@
+ main ()
+ {
+ 
+-		char res= *(*rl_completion_entry_function)(0,0);
++		char res=(*rl_completion_entry_function)(0,0);
+ 		completion_matches(0,0);
+ 
+   ;
diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
new file mode 100644
index 00000000000..a3c6d3f2c53
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-av
@@ -0,0 +1,19 @@
+$NetBSD: patch-av,v 1.8 2008/03/26 13:22:00 wiz Exp $
+
+--- Makefile.in.orig	2006-11-03 04:19:15.000000000 +0200
++++ Makefile.in	2007-05-23 08:21:08.000000000 +0300
+@@ -353,13 +353,7 @@
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
+ 
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
+-			@readline_topdir@ sql-common \
+-			@thread_dirs@ pstack \
+-			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			netware @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+-
++SUBDIRS = . include strings @sql_client_dirs@ scripts man
+ DIST_SUBDIRS = . include @docs_dirs@ zlib \
+ 			@readline_topdir@ sql-common \
+ 			@thread_dirs@ pstack \
diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw
new file mode 100644
index 00000000000..66443e97276
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-aw
@@ -0,0 +1,15 @@
+$NetBSD: patch-aw,v 1.6 2008/03/26 13:22:00 wiz Exp $
+
+--- man/Makefile.in.orig	2006-11-03 04:18:34.000000000 +0200
++++ man/Makefile.in	2007-05-23 08:40:58.000000000 +0300
+@@ -327,8 +327,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
+-man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
++man1_MANS = msql2mysql.1 mysql.1 mysql_config.1 mysql_fix_privilege_tables.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlshow.1
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ all: all-am
+ 
diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax
new file mode 100644
index 00000000000..1ee334370a3
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ax
@@ -0,0 +1,32 @@
+$NetBSD: patch-ax,v 1.8 2008/03/26 13:22:00 wiz Exp $
+
+--- scripts/Makefile.in.orig	2006-11-03 04:19:06.000000000 +0200
++++ scripts/Makefile.in	2007-05-23 08:24:33.000000000 +0300
+@@ -335,23 +335,10 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
+-bin_SCRIPTS = @server_scripts@ \
+-			msql2mysql \
+-			mysql_config \
+-			mysql_fix_privilege_tables \
+-			mysql_fix_extensions \
+-			mysql_setpermission \
+-			mysql_secure_installation \
+-			mysql_zap \
+-			mysqlaccess \
+-			mysqlbug \
+-			mysql_convert_table_format \
+-			mysql_find_rows \
+-			mysqlhotcopy \
+-			mysqldumpslow \
+-			mysql_explain_log \
+-			mysql_tableinfo \
+-			mysqld_multi \
++bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
++	mysql_setpermission mysql_zap mysqlaccess mysqlbug \
++	mysql_convert_table_format mysql_find_rows mysqlhotcopy \
++	mysql_explain_log mysql_tableinfo \
+ 			mysql_create_system_tables
+ 
+ noinst_SCRIPTS = make_binary_distribution \
diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay
new file mode 100644
index 00000000000..51df0e3039c
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ay
@@ -0,0 +1,22 @@
+$NetBSD: patch-ay,v 1.6 2008/03/26 13:22:00 wiz Exp $
+
+--- strings/Makefile.in.orig	2006-11-03 04:19:10.000000000 +0200
++++ strings/Makefile.in	2007-05-23 08:24:57.000000000 +0300
+@@ -584,7 +584,7 @@
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    f=$(am__strip_dir) \
+ 	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ 	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+@@ -592,7 +592,7 @@
+ 	done
+ 	@$(POST_INSTALL)
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    p=$(am__strip_dir) \
+ 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ 	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
diff --git a/databases/mysql4-client/patches/patch-ba b/databases/mysql4-client/patches/patch-ba
new file mode 100644
index 00000000000..eec23ee6ae6
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ba
@@ -0,0 +1,30 @@
+$NetBSD: patch-ba,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- client/mysql.cc.orig	2006-11-03 04:15:47.000000000 +0200
++++ client/mysql.cc	2007-05-23 08:25:23.000000000 +0300
+@@ -39,6 +39,9 @@
+ #include "my_readline.h"
+ #include <signal.h>
+ #include <violite.h>
++#ifdef NEEDS_BSTRING_H              // defines bzero()
++#include <bstring.h>
++#endif
+ 
+ #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
+ #include <locale.h>
+@@ -410,8 +413,13 @@
+   if (opt_sigint_ignore)
+     signal(SIGINT, SIG_IGN);
+   else
+-    signal(SIGINT, mysql_end);			// Catch SIGINT to clean up
+-  signal(SIGQUIT, mysql_end);			// Catch SIGQUIT to clean up
++#ifdef IRIX5
++#define _MYSQL_END_TYPE (void (*)(...))
++#else
++#define _MYSQL_END_TYPE
++#endif
++	signal(SIGINT, _MYSQL_END_TYPE mysql_end); // Catch SIGINT to clean up
++    signal(SIGQUIT, _MYSQL_END_TYPE mysql_end);  // Catch SIGQUIT to clean up
+ 
+   /*
+     Run in interactive mode like the ingres/postgres monitor
diff --git a/databases/mysql4-client/patches/patch-bb b/databases/mysql4-client/patches/patch-bb
new file mode 100644
index 00000000000..713540ed70f
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+--- client/completion_hash.cc.orig	2005-02-18 01:38:24.000000000 +0100
++++ client/completion_hash.cc	2005-02-18 01:38:47.000000000 +0100
+@@ -23,6 +23,10 @@
+ 
+ #include <my_global.h>
+ #include <m_string.h>
++#ifdef NEEDS_BSTRING_H                         // defines bzero()
++#include <bstring.h>
++#endif
++
+ #undef SAFEMALLOC				// Speed things up
+ #include <my_sys.h>
+ #include "completion_hash.h"
diff --git a/databases/mysql4-client/patches/patch-bc b/databases/mysql4-client/patches/patch-bc
new file mode 100644
index 00000000000..930a981dbf0
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bc
@@ -0,0 +1,21 @@
+$NetBSD: patch-bc,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+--- client/mysqladmin.cc.orig	2005-02-18 01:39:09.000000000 +0100
++++ client/mysqladmin.cc	2005-02-18 01:40:21.000000000 +0100
+@@ -326,8 +326,14 @@
+   if (tty_password)
+     opt_password = get_tty_password(NullS);
+ 
+-  VOID(signal(SIGINT,endprog));			/* Here if abort */
+-  VOID(signal(SIGTERM,endprog));		/* Here if abort */
++#ifdef IRIX5
++#define _MYSQL_END_TYPE (void (*)(...))
++#else
++#define _MYSQL_END_TYPE
++#endif
++
++  VOID(signal(SIGINT,_MYSQL_END_TYPE endprog)); /* Here if abort */
++  VOID(signal(SIGTERM,_MYSQL_END_TYPE endprog));/* Here if abort */
+ 
+   if (opt_compress)
+     mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
diff --git a/databases/mysql4-client/patches/patch-bd b/databases/mysql4-client/patches/patch-bd
new file mode 100644
index 00000000000..c31fc762be2
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bd
@@ -0,0 +1,69 @@
+$NetBSD: patch-bd,v 1.5 2008/03/26 13:22:00 wiz Exp $
+
+--- tests/mysql_client_test.c.orig	2006-11-03 04:15:21.000000000 +0200
++++ tests/mysql_client_test.c	2007-05-23 08:25:53.000000000 +0300
+@@ -22,6 +22,7 @@
+ ***************************************************************************/
+ 
+ #include <my_global.h>
++#include <mysqld_error.h>
+ #include <my_sys.h>
+ #include <mysql.h>
+ #include <errmsg.h>
+@@ -11856,6 +11857,48 @@
+   mysql_stmt_close(stmt);
+ }
+ 
++/*
++  Bug #17667: An attacker has the opportunity to bypass query logging.
++ */
++
++static void test_bug17667()
++{
++  NET *net= &mysql->net;
++  int rc;
++  myheader("test_bug17667");
++
++  /* I. Prepare the table */
++  mysql_real_query(mysql,     "drop table if exists t1", 23);
++
++  rc= mysql_real_query(mysql, "create table t1 (i int)", 23);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "insert into t1 (i) values (1)", 29);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "insert into /* NUL=\0 */ t1 (i) values (2)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == ER_PARSE_ERROR);
++
++  mysql_real_query(mysql,     "/* NUL=\0 */ insert into t1 (i) values (3)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == ER_PARSE_ERROR);
++
++  mysql_real_query(mysql,     "insert into /* TAB=\t */ t1 (i) values (4)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "/* TAB=\t */ insert into t1 (i) values (5)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  /* II. Cleanup */
++  rc= mysql_real_query(mysql, "drop table t1", 13);
++  myquery(rc);
++}
++
+ 
+ /*
+  Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
+@@ -12170,6 +12213,7 @@
+   { "test_bug11718", test_bug11718 },
+   { "test_bug12925", test_bug12925 },
+   { "test_bug15613", test_bug15613 },
++  { "test_bug17667", test_bug17667 },
+   { "test_bug20152", test_bug20152 },
+   { "test_bug21726", test_bug21726 },
+   { 0, 0 }
diff --git a/databases/mysql4-client/patches/patch-be b/databases/mysql4-client/patches/patch-be
new file mode 100644
index 00000000000..89ec7f49835
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- sql/sql_lex.cc.orig	2006-11-03 04:15:21.000000000 +0200
++++ sql/sql_lex.cc	2007-05-23 08:26:27.000000000 +0300
+@@ -894,6 +894,8 @@
+       while (lex->ptr != lex->end_of_query &&
+ 	     ((c=yyGet()) != '*' || yyPeek() != '/'))
+       {
++	if (c == '\0')
++	  return(ABORT_SYM);		// NULLs illegal even in comments
+ 	if (c == '\n')
+ 	  lex->yylineno++;
+       }
diff --git a/databases/mysql4-client/patches/patch-bf b/databases/mysql4-client/patches/patch-bf
new file mode 100644
index 00000000000..71c5ea887b9
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+--- bdb/dist/configure.orig	2006-10-08 15:25:31.000000000 +0200
++++ bdb/dist/configure	2006-10-08 15:26:39.000000000 +0200
+@@ -5038,7 +5038,7 @@ fi
+ # we're using.
+ case "$host_os" in
+ sysv5UnixWare*|sysv5OpenUNIX8*)
+-	if test "$GCC" == "yes"; then
++	if test "$GCC" = "yes"; then
+ 		CPPFLAGS="$CPPFLAGS -pthread"
+ 		LDFLAGS="$LDFLAGS -pthread"
+ 	else
diff --git a/databases/mysql4-server/DEINSTALL b/databases/mysql4-server/DEINSTALL
new file mode 100644
index 00000000000..5d74b4c3a2b
--- /dev/null
+++ b/databases/mysql4-server/DEINSTALL
@@ -0,0 +1,16 @@
+# $NetBSD: DEINSTALL,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+case ${STAGE} in
+POST-DEINSTALL)
+	if [ -d @MYSQL_DATADIR@ ]; then
+		${CAT} << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, and you don't
+wish to preserve your existing databases, then you may remove the
+following directory:
+
+	@MYSQL_DATADIR@
+===========================================================================
+EOF
+	fi
+esac
diff --git a/databases/mysql4-server/DESCR b/databases/mysql4-server/DESCR
new file mode 100644
index 00000000000..02b7abc487b
--- /dev/null
+++ b/databases/mysql4-server/DESCR
@@ -0,0 +1,15 @@
+MySQL is a SQL (Structured Query Language) database server.  SQL is the
+most popular database language in the world.  MySQL is a client-server
+implementation that consists of a server daemon `mysqld' and many
+different client programs/libraries.
+
+The main goals of MySQL are speed and robustness.
+
+The base upon which MySQL is built is a set of routines that have been
+used in a highly demanding production environment for many years.  While
+MySQL is still in development it already offers a rich and highly useful
+function set.
+
+The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
+
+This package contains the MySQL server programs and libraries.
diff --git a/databases/mysql4-server/MESSAGE b/databases/mysql4-server/MESSAGE
new file mode 100644
index 00000000000..720eb353266
--- /dev/null
+++ b/databases/mysql4-server/MESSAGE
@@ -0,0 +1,21 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.9 2008/03/26 13:22:00 wiz Exp $
+
+After the tables are set up and the MySQL server is running,
+please remember to set a password for the MySQL root user!
+This is done by running both:
+
+  ${PREFIX}/bin/mysqladmin -u root -p password 'new-password'
+  ${PREFIX}/bin/mysqladmin -h `hostname` -u root -p password 'new-password'
+
+The "Enter password:" prompt is asking for the existing password.
+As there is no existing password, just press the Return key.
+
+There is a script distributed with MySQL that can help you lock down
+an installation.  This script has been installed to
+
+  ${PREFIX}/bin/mysql_secure_installation.
+
+Please see the manual and the MySQL web site for more instructions.
+
+===========================================================================
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
new file mode 100644
index 00000000000..594665a6483
--- /dev/null
+++ b/databases/mysql4-server/Makefile
@@ -0,0 +1,77 @@
+# $NetBSD: Makefile,v 1.37 2008/03/26 13:22:00 wiz Exp $
+
+PKGNAME=		${DISTNAME:S/-/-server-/}
+SVR4_PKGNAME=		mysqs
+PKGREVISION=		2
+COMMENT=		MySQL 4, a free SQL database (server)
+
+CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "../../databases/mysql4-client/Makefile.common"
+
+REPLACE_PERL+=		mysql-test/mysql-test-run.pl
+# No dependency on Perl.
+
+CONFIGURE_ARGS+=	--with-libwrap
+CONFIGURE_ARGS+=	--with-raid
+CONFIGURE_ARGS+=	--without-berkeley-db
+CONFIGURE_ARGS+=	--without-mysqlfs
+CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
+
+PTHREAD_OPTS+=		require
+CONFIGURE_ARGS+=	--with-pthreads
+
+PKG_GROUPS=		${MYSQL_GROUP}
+PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}
+
+PKG_GECOS.${MYSQL_USER}=	MySQL database administrator
+PKG_HOME.${MYSQL_USER}=		${MYSQL_DATADIR}
+PKG_SHELL.${MYSQL_USER}=	${SH}
+
+RCD_SCRIPTS=		mysqld
+
+FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
+			MYSQL_DATADIR=${MYSQL_DATADIR:Q} \
+			MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q}
+MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
+			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
+BUILD_DEFS+=		MYSQL_DATADIR
+BUILD_DIRS=		${WRKSRC} ${WRKSRC}/man
+
+INSTALLATION_DIRS=	bin
+
+.include "../../databases/mysql4-client/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+
+# We only need readline to placate the configure script.  None of the
+# binaries are actually linked against -lreadline, so make this only
+# a build-time dependency.
+#
+BUILDLINK_DEPMETHOD.readline=	build
+.include "../../devel/readline/buildlink3.mk"
+
+post-extract:
+	chmod -x ${WRKSRC}/mysql-test/mysql-test-run.pl
+
+post-configure:
+	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
+
+post-build:
+	cd ${WRKSRC}/scripts && \
+	${BUILD_MAKE_CMD} mysqld_safe mysql_install_db mysqldumpslow
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqldumpslow \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
+		${DESTDIR}${PREFIX}/bin/mysql_secure_installation
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
new file mode 100644
index 00000000000..8167f6a624c
--- /dev/null
+++ b/databases/mysql4-server/PLIST
@@ -0,0 +1,1108 @@
+@comment $NetBSD: PLIST,v 1.21 2008/03/26 13:22:00 wiz Exp $
+bin/comp_err
+bin/isamchk
+bin/isamlog
+bin/my_print_defaults
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+bin/mysql.server
+bin/mysql_client_test
+bin/mysql_install_db
+bin/mysql_secure_installation
+bin/mysql_tzinfo_to_sql
+bin/mysql_waitpid
+bin/mysqld_safe
+bin/mysqldumpslow
+bin/pack_isam
+bin/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+lib/mysql/libdbug.a
+lib/mysql/libheap.a
+lib/mysql/libmerge.a
+lib/mysql/libmyisam.a
+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/myisam_ftdump.1
+man/man1/myisamchk.1
+man/man1/myisamlog.1
+man/man1/myisampack.1
+man/man1/mysql.server.1
+man/man1/mysqld.1
+man/man1/mysqld_multi.1
+man/man1/mysqld_safe.1
+man/man1/pack_isam.1
+man/man1/perror.1
+man/man1/replace.1
+man/man8/mysqld.8
+share/examples/rc.d/mysqld
+share/mysql-test/README
+share/mysql-test/cacert.pem
+share/mysql-test/client-cert.pem
+share/mysql-test/client-key.pem
+share/mysql-test/include/check_var_limit.inc
+share/mysql-test/include/ctype_common.inc
+share/mysql-test/include/ctype_filesort.inc
+share/mysql-test/include/ctype_innodb_like.inc
+share/mysql-test/include/ctype_like_escape.inc
+share/mysql-test/include/endspace.inc
+share/mysql-test/include/have_archive.inc
+share/mysql-test/include/have_bdb.inc
+share/mysql-test/include/have_big5.inc
+share/mysql-test/include/have_blackhole.inc
+share/mysql-test/include/have_case_sensitive_file_system.inc
+share/mysql-test/include/have_compress.inc
+share/mysql-test/include/have_cp1250_ch.inc
+share/mysql-test/include/have_cp932.inc
+share/mysql-test/include/have_crypt.inc
+share/mysql-test/include/have_csv.inc
+share/mysql-test/include/have_debug.inc
+share/mysql-test/include/have_euckr.inc
+share/mysql-test/include/have_exampledb.inc
+share/mysql-test/include/have_gb2312.inc
+share/mysql-test/include/have_gbk.inc
+share/mysql-test/include/have_geometry.inc
+share/mysql-test/include/have_innodb.inc
+share/mysql-test/include/have_isam.inc
+share/mysql-test/include/have_latin2_ch.inc
+share/mysql-test/include/have_lowercase0.inc
+share/mysql-test/include/have_multi_ndb.inc
+share/mysql-test/include/have_ndb.inc
+share/mysql-test/include/have_openssl.inc
+share/mysql-test/include/have_openssl_1.inc
+share/mysql-test/include/have_outfile.inc
+share/mysql-test/include/have_query_cache.inc
+share/mysql-test/include/have_sjis.inc
+share/mysql-test/include/have_tis620.inc
+share/mysql-test/include/have_ucs2.inc
+share/mysql-test/include/have_ujis.inc
+share/mysql-test/include/master-slave.inc
+share/mysql-test/include/mysqltest-x.inc
+share/mysql-test/include/mysqltest_while.inc
+share/mysql-test/include/not_embedded.inc
+share/mysql-test/include/not_openssl.inc
+share/mysql-test/include/not_windows.inc
+share/mysql-test/include/ps_conv.inc
+share/mysql-test/include/ps_create.inc
+share/mysql-test/include/ps_modify.inc
+share/mysql-test/include/ps_modify1.inc
+share/mysql-test/include/ps_query.inc
+share/mysql-test/include/ps_renew.inc
+share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/system_db_struct.inc
+share/mysql-test/include/test_outfile.inc
+share/mysql-test/include/windows.inc
+share/mysql-test/install_test_db
+share/mysql-test/lib/init_db.sql
+share/mysql-test/lib/mtr_cases.pl
+share/mysql-test/lib/mtr_diff.pl
+share/mysql-test/lib/mtr_gcov.pl
+share/mysql-test/lib/mtr_gprof.pl
+share/mysql-test/lib/mtr_io.pl
+share/mysql-test/lib/mtr_match.pl
+share/mysql-test/lib/mtr_misc.pl
+share/mysql-test/lib/mtr_process.pl
+share/mysql-test/lib/mtr_report.pl
+share/mysql-test/lib/mtr_timer.pl
+share/mysql-test/mtr
+share/mysql-test/mysql-test-run
+share/mysql-test/mysql-test-run.pl
+share/mysql-test/r/alias.result
+share/mysql-test/r/alter_table.result
+share/mysql-test/r/analyse.result
+share/mysql-test/r/analyze.result
+share/mysql-test/r/ansi.result
+share/mysql-test/r/archive.result
+share/mysql-test/r/auto_increment.result
+share/mysql-test/r/backup.result
+share/mysql-test/r/bdb-alter-table-1.result
+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/blackhole.result
+share/mysql-test/r/bool.result
+share/mysql-test/r/bulk_replace.result
+share/mysql-test/r/case.result
+share/mysql-test/r/case_sensitive_file_system.require
+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/connect.result
+share/mysql-test/r/consistent_snapshot.result
+share/mysql-test/r/constraints.result
+share/mysql-test/r/count_distinct.result
+share/mysql-test/r/count_distinct2.result
+share/mysql-test/r/count_distinct3.result
+share/mysql-test/r/create.result
+share/mysql-test/r/create_select_tmp.result
+share/mysql-test/r/csv.result
+share/mysql-test/r/ctype_big5.result
+share/mysql-test/r/ctype_collate.result
+share/mysql-test/r/ctype_cp1250_ch.result
+share/mysql-test/r/ctype_cp1251.result
+share/mysql-test/r/ctype_cp932.result
+share/mysql-test/r/ctype_cp932_binlog.result
+share/mysql-test/r/ctype_create.result
+share/mysql-test/r/ctype_euckr.result
+share/mysql-test/r/ctype_gb2312.result
+share/mysql-test/r/ctype_gbk.result
+share/mysql-test/r/ctype_latin1.result
+share/mysql-test/r/ctype_latin1_de.result
+share/mysql-test/r/ctype_latin2.result
+share/mysql-test/r/ctype_latin2_ch.result
+share/mysql-test/r/ctype_many.result
+share/mysql-test/r/ctype_mb.result
+share/mysql-test/r/ctype_recoding.result
+share/mysql-test/r/ctype_sjis.result
+share/mysql-test/r/ctype_tis620.result
+share/mysql-test/r/ctype_uca.result
+share/mysql-test/r/ctype_ucs.result
+share/mysql-test/r/ctype_ucs2_def.result
+share/mysql-test/r/ctype_ucs_binlog.result
+share/mysql-test/r/ctype_ujis.result
+share/mysql-test/r/ctype_utf8.result
+share/mysql-test/r/date_formats.result
+share/mysql-test/r/delayed.result
+share/mysql-test/r/delete.result
+share/mysql-test/r/derived.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/endspace.result
+share/mysql-test/r/errors.result
+share/mysql-test/r/exampledb.result
+share/mysql-test/r/explain.result
+share/mysql-test/r/flush.result
+share/mysql-test/r/flush_block_commit.result
+share/mysql-test/r/flush_table.result
+share/mysql-test/r/foreign_key.result
+share/mysql-test/r/fulltext.result
+share/mysql-test/r/fulltext2.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_compress.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_default.result
+share/mysql-test/r/func_des_encrypt.result
+share/mysql-test/r/func_encrypt.result
+share/mysql-test/r/func_encrypt_nossl.result
+share/mysql-test/r/func_equal.result
+share/mysql-test/r/func_gconcat.result
+share/mysql-test/r/func_group.result
+share/mysql-test/r/func_if.result
+share/mysql-test/r/func_in.result
+share/mysql-test/r/func_isnull.result
+share/mysql-test/r/func_like.result
+share/mysql-test/r/func_math.result
+share/mysql-test/r/func_misc.result
+share/mysql-test/r/func_op.result
+share/mysql-test/r/func_regexp.result
+share/mysql-test/r/func_sapdb.result
+share/mysql-test/r/func_set.result
+share/mysql-test/r/func_str.result
+share/mysql-test/r/func_system.result
+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/gis-rtree.result
+share/mysql-test/r/gis.result
+share/mysql-test/r/grant.result
+share/mysql-test/r/grant2.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_archive.require
+share/mysql-test/r/have_bdb.require
+share/mysql-test/r/have_big5.require
+share/mysql-test/r/have_blackhole.require
+share/mysql-test/r/have_compress.require
+share/mysql-test/r/have_cp1250_ch.require
+share/mysql-test/r/have_cp932.require
+share/mysql-test/r/have_crypt.require
+share/mysql-test/r/have_csv.require
+share/mysql-test/r/have_debug.require
+share/mysql-test/r/have_euckr.require
+share/mysql-test/r/have_exampledb.require
+share/mysql-test/r/have_gb2312.require
+share/mysql-test/r/have_gbk.require
+share/mysql-test/r/have_geometry.require
+share/mysql-test/r/have_innodb.require
+share/mysql-test/r/have_isam.require
+share/mysql-test/r/have_latin2_ch.require
+share/mysql-test/r/have_met_timezone.require
+share/mysql-test/r/have_moscow_leap_timezone.require
+share/mysql-test/r/have_ndb.require
+share/mysql-test/r/have_openssl.require
+share/mysql-test/r/have_openssl_1.require
+share/mysql-test/r/have_outfile.require
+share/mysql-test/r/have_query_cache.require
+share/mysql-test/r/have_raid.require
+share/mysql-test/r/have_sjis.require
+share/mysql-test/r/have_symlink.require
+share/mysql-test/r/have_tis620.require
+share/mysql-test/r/have_ucs2.require
+share/mysql-test/r/have_ujis.require
+share/mysql-test/r/having.result
+share/mysql-test/r/heap.result
+share/mysql-test/r/heap_auto_increment.result
+share/mysql-test/r/heap_btree.result
+share/mysql-test/r/heap_hash.result
+share/mysql-test/r/help.result
+share/mysql-test/r/init_connect.result
+share/mysql-test/r/innodb-deadlock.result
+share/mysql-test/r/innodb-lock.result
+share/mysql-test/r/innodb-replace.result
+share/mysql-test/r/innodb.result
+share/mysql-test/r/innodb_cache.result
+share/mysql-test/r/innodb_handler.result
+share/mysql-test/r/innodb_mysql.result
+share/mysql-test/r/insert.result
+share/mysql-test/r/insert_select-binlog.result
+share/mysql-test/r/insert_select.result
+share/mysql-test/r/insert_update.result
+share/mysql-test/r/isam.result
+share/mysql-test/r/join.result
+share/mysql-test/r/join_crash.result
+share/mysql-test/r/join_outer.result
+share/mysql-test/r/key.result
+share/mysql-test/r/key_cache.result
+share/mysql-test/r/key_diff.result
+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/lowercase0.require
+share/mysql-test/r/lowercase2.require
+share/mysql-test/r/lowercase_fs_off.result
+share/mysql-test/r/lowercase_table.result
+share/mysql-test/r/lowercase_table2.result
+share/mysql-test/r/lowercase_table3.result
+share/mysql-test/r/lowercase_table_grant.result
+share/mysql-test/r/lowercase_table_qcache.result
+share/mysql-test/r/merge.result
+share/mysql-test/r/metadata.result
+share/mysql-test/r/mix_innodb_myisam_binlog.result
+share/mysql-test/r/multi_statement.result
+share/mysql-test/r/multi_update.result
+share/mysql-test/r/myisam-blob.result
+share/mysql-test/r/myisam.result
+share/mysql-test/r/mysql_client.result
+share/mysql-test/r/mysql_protocols.result
+share/mysql-test/r/mysqlbinlog.result
+share/mysql-test/r/mysqlbinlog2.result
+share/mysql-test/r/mysqldump.result
+share/mysql-test/r/mysqltest.result
+share/mysql-test/r/ndb_alter_table.result
+share/mysql-test/r/ndb_autodiscover.result
+share/mysql-test/r/ndb_autodiscover2.result
+share/mysql-test/r/ndb_autodiscover3.result
+share/mysql-test/r/ndb_basic.result
+share/mysql-test/r/ndb_blob.result
+share/mysql-test/r/ndb_cache.result
+share/mysql-test/r/ndb_charset.result
+share/mysql-test/r/ndb_config.result
+share/mysql-test/r/ndb_database.result
+share/mysql-test/r/ndb_grant.result
+share/mysql-test/r/ndb_index.result
+share/mysql-test/r/ndb_index_ordered.result
+share/mysql-test/r/ndb_index_unique.result
+share/mysql-test/r/ndb_insert.result
+share/mysql-test/r/ndb_limit.result
+share/mysql-test/r/ndb_load.result
+share/mysql-test/r/ndb_loaddatalocal.result
+share/mysql-test/r/ndb_lock.result
+share/mysql-test/r/ndb_minmax.result
+share/mysql-test/r/ndb_multi.result
+share/mysql-test/r/ndb_rename.result
+share/mysql-test/r/ndb_replace.result
+share/mysql-test/r/ndb_restore.result
+share/mysql-test/r/ndb_subquery.result
+share/mysql-test/r/ndb_transaction.result
+share/mysql-test/r/ndb_truncate.result
+share/mysql-test/r/ndb_types.result
+share/mysql-test/r/ndb_update.result
+share/mysql-test/r/negation_elimination.result
+share/mysql-test/r/not_embedded.require
+share/mysql-test/r/not_embedded_server.result
+share/mysql-test/r/not_openssl.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/outfile.result
+share/mysql-test/r/overflow.result
+share/mysql-test/r/packet.result
+share/mysql-test/r/preload.result
+share/mysql-test/r/ps.result
+share/mysql-test/r/ps_10nestset.result
+share/mysql-test/r/ps_11bugs.result
+share/mysql-test/r/ps_1general.result
+share/mysql-test/r/ps_2myisam.result
+share/mysql-test/r/ps_3innodb.result
+share/mysql-test/r/ps_4heap.result
+share/mysql-test/r/ps_5merge.result
+share/mysql-test/r/ps_6bdb.result
+share/mysql-test/r/ps_7ndb.result
+share/mysql-test/r/ps_grant.result
+share/mysql-test/r/query_cache.result
+share/mysql-test/r/query_cache_merge.result
+share/mysql-test/r/query_cache_notembedded.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/replace.result
+share/mysql-test/r/rollback.result
+share/mysql-test/r/row.result
+share/mysql-test/r/rpl000001.result
+share/mysql-test/r/rpl000002.result
+share/mysql-test/r/rpl000004.result
+share/mysql-test/r/rpl000005.result
+share/mysql-test/r/rpl000006.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/rpl000015.result
+share/mysql-test/r/rpl000017.result
+share/mysql-test/r/rpl000018.result
+share/mysql-test/r/rpl_EE_error.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_charset.result
+share/mysql-test/r/rpl_commit_after_flush.result
+share/mysql-test/r/rpl_create_database.result
+share/mysql-test/r/rpl_ddl.result
+share/mysql-test/r/rpl_deadlock.result
+share/mysql-test/r/rpl_delete_all.result
+share/mysql-test/r/rpl_do_grant.result
+share/mysql-test/r/rpl_drop.result
+share/mysql-test/r/rpl_drop_db.result
+share/mysql-test/r/rpl_drop_temp.result
+share/mysql-test/r/rpl_dual_pos_advance.result
+share/mysql-test/r/rpl_empty_master_crash.result
+share/mysql-test/r/rpl_error_ignored_table.result
+share/mysql-test/r/rpl_failed_optimize.result
+share/mysql-test/r/rpl_failsafe.result
+share/mysql-test/r/rpl_flush_log_loop.result
+share/mysql-test/r/rpl_flush_tables.result
+share/mysql-test/r/rpl_free_items.result
+share/mysql-test/r/rpl_get_lock.result
+share/mysql-test/r/rpl_heap.result
+share/mysql-test/r/rpl_ignore_grant.result
+share/mysql-test/r/rpl_ignore_table.result
+share/mysql-test/r/rpl_init_slave.result
+share/mysql-test/r/rpl_innodb.result
+share/mysql-test/r/rpl_insert_id.result
+share/mysql-test/r/rpl_insert_ignore.result
+share/mysql-test/r/rpl_insert_select.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_many_optimize.result
+share/mysql-test/r/rpl_master_pos_wait.result
+share/mysql-test/r/rpl_max_relay_size.result
+share/mysql-test/r/rpl_misc_functions.result
+share/mysql-test/r/rpl_multi_delete.result
+share/mysql-test/r/rpl_multi_delete2.result
+share/mysql-test/r/rpl_multi_query.result
+share/mysql-test/r/rpl_multi_update.result
+share/mysql-test/r/rpl_multi_update2.result
+share/mysql-test/r/rpl_multi_update3.result
+share/mysql-test/r/rpl_multi_update4.result
+share/mysql-test/r/rpl_mystery22.result
+share/mysql-test/r/rpl_openssl.result
+share/mysql-test/r/rpl_optimize.result
+share/mysql-test/r/rpl_ps.result
+share/mysql-test/r/rpl_redirect.result
+share/mysql-test/r/rpl_relayrotate.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_rewrite_db.result
+share/mysql-test/r/rpl_rotate_logs.result
+share/mysql-test/r/rpl_server_id1.result
+share/mysql-test/r/rpl_server_id2.result
+share/mysql-test/r/rpl_set_charset.result
+share/mysql-test/r/rpl_skip_error.result
+share/mysql-test/r/rpl_slave_status.result
+share/mysql-test/r/rpl_sporadic_master.result
+share/mysql-test/r/rpl_start_stop_slave.result
+share/mysql-test/r/rpl_temporary.result
+share/mysql-test/r/rpl_timezone.result
+share/mysql-test/r/rpl_trunc_binlog.result
+share/mysql-test/r/rpl_trunc_temp.result
+share/mysql-test/r/rpl_until.result
+share/mysql-test/r/rpl_user_variables.result
+share/mysql-test/r/rpl_variables.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/skip_name_resolve.result
+share/mysql-test/r/slave-running.result
+share/mysql-test/r/slave-stopped.result
+share/mysql-test/r/sql_mode.result
+share/mysql-test/r/status.result
+share/mysql-test/r/subselect.result
+share/mysql-test/r/subselect2.result
+share/mysql-test/r/subselect_gis.result
+share/mysql-test/r/subselect_innodb.result
+share/mysql-test/r/symlink.result
+share/mysql-test/r/synchronization.result
+share/mysql-test/r/system_mysql_db.result
+share/mysql-test/r/system_mysql_db_refs.result
+share/mysql-test/r/tablelock.result
+share/mysql-test/r/temp_table.result
+share/mysql-test/r/timezone.result
+share/mysql-test/r/timezone2.result
+share/mysql-test/r/timezone3.result
+share/mysql-test/r/timezone_grant.result
+share/mysql-test/r/true.require
+share/mysql-test/r/truncate.result
+share/mysql-test/r/type_blob.result
+share/mysql-test/r/type_date.result
+share/mysql-test/r/type_datetime.result
+share/mysql-test/r/type_decimal.result
+share/mysql-test/r/type_enum.result
+share/mysql-test/r/type_float.result
+share/mysql-test/r/type_nchar.result
+share/mysql-test/r/type_ranges.result
+share/mysql-test/r/type_set.result
+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-binlog.result
+share/mysql-test/r/user_var.result
+share/mysql-test/r/varbinary.result
+share/mysql-test/r/variables.result
+share/mysql-test/r/wait_timeout.result
+share/mysql-test/r/warnings.result
+share/mysql-test/r/windows.result
+share/mysql-test/server-cert.pem
+share/mysql-test/server-key.pem
+share/mysql-test/std_data/Moscow_leap
+share/mysql-test/std_data/bug15328.cnf
+share/mysql-test/std_data/cacert.pem
+share/mysql-test/std_data/client-cert.pem
+share/mysql-test/std_data/client-key.pem
+share/mysql-test/std_data/des_key_file
+share/mysql-test/std_data/init_file.dat
+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/loaddata5.dat
+share/mysql-test/std_data/loaddata_pair.dat
+share/mysql-test/std_data/master-bin.000001
+share/mysql-test/std_data/rpl_loaddata.dat
+share/mysql-test/std_data/rpl_loaddata2.dat
+share/mysql-test/std_data/server-cert.pem
+share/mysql-test/std_data/server-key.pem
+share/mysql-test/std_data/trunc_binlog.000001
+share/mysql-test/std_data/warnings_loaddata.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/analyze.test
+share/mysql-test/t/ansi.test
+share/mysql-test/t/archive.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/blackhole.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/connect.test
+share/mysql-test/t/consistent_snapshot.test
+share/mysql-test/t/constraints.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/count_distinct3.test
+share/mysql-test/t/create.test
+share/mysql-test/t/create_select_tmp.test
+share/mysql-test/t/csv.test
+share/mysql-test/t/ctype_big5.test
+share/mysql-test/t/ctype_collate.test
+share/mysql-test/t/ctype_cp1250_ch.test
+share/mysql-test/t/ctype_cp1251.test
+share/mysql-test/t/ctype_cp932.test
+share/mysql-test/t/ctype_cp932_binlog.test
+share/mysql-test/t/ctype_create.test
+share/mysql-test/t/ctype_euckr.test
+share/mysql-test/t/ctype_gb2312.test
+share/mysql-test/t/ctype_gbk.test
+share/mysql-test/t/ctype_latin1.test
+share/mysql-test/t/ctype_latin1_de-master.opt
+share/mysql-test/t/ctype_latin1_de.test
+share/mysql-test/t/ctype_latin2.test
+share/mysql-test/t/ctype_latin2_ch.test
+share/mysql-test/t/ctype_many.test
+share/mysql-test/t/ctype_mb.test
+share/mysql-test/t/ctype_recoding.test
+share/mysql-test/t/ctype_sjis.test
+share/mysql-test/t/ctype_tis620.test
+share/mysql-test/t/ctype_uca.test
+share/mysql-test/t/ctype_ucs.test
+share/mysql-test/t/ctype_ucs2_def-master.opt
+share/mysql-test/t/ctype_ucs2_def.test
+share/mysql-test/t/ctype_ucs_binlog.test
+share/mysql-test/t/ctype_ujis.test
+share/mysql-test/t/ctype_utf8.test
+share/mysql-test/t/date_formats-master.opt
+share/mysql-test/t/date_formats.test
+share/mysql-test/t/delayed.test
+share/mysql-test/t/delete.test
+share/mysql-test/t/derived.test
+share/mysql-test/t/dirty_close.test
+share/mysql-test/t/disabled.def
+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/endspace.test
+share/mysql-test/t/errors.test
+share/mysql-test/t/exampledb.test
+share/mysql-test/t/explain.test
+share/mysql-test/t/flush.test
+share/mysql-test/t/flush_block_commit.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/fulltext2.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_compress.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_default.test
+share/mysql-test/t/func_des_encrypt.test
+share/mysql-test/t/func_encrypt-master.opt
+share/mysql-test/t/func_encrypt.test
+share/mysql-test/t/func_encrypt_nossl.test
+share/mysql-test/t/func_equal.test
+share/mysql-test/t/func_gconcat.test
+share/mysql-test/t/func_group.test
+share/mysql-test/t/func_if.test
+share/mysql-test/t/func_in.test
+share/mysql-test/t/func_isnull.test
+share/mysql-test/t/func_like.test
+share/mysql-test/t/func_math.test
+share/mysql-test/t/func_misc.test
+share/mysql-test/t/func_op.test
+share/mysql-test/t/func_regexp.test
+share/mysql-test/t/func_sapdb.test
+share/mysql-test/t/func_set.test
+share/mysql-test/t/func_str.test
+share/mysql-test/t/func_system.test
+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/gis-rtree.test
+share/mysql-test/t/gis.test
+share/mysql-test/t/grant.test
+share/mysql-test/t/grant2.test
+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/heap_auto_increment.test
+share/mysql-test/t/heap_btree.test
+share/mysql-test/t/heap_hash.test
+share/mysql-test/t/help.test
+share/mysql-test/t/init_connect-master.opt
+share/mysql-test/t/init_connect.test
+share/mysql-test/t/init_file-master.opt
+share/mysql-test/t/init_file.test
+share/mysql-test/t/innodb-deadlock.test
+share/mysql-test/t/innodb-lock.test
+share/mysql-test/t/innodb-master.opt
+share/mysql-test/t/innodb-replace.test
+share/mysql-test/t/innodb.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/innodb_mysql.test
+share/mysql-test/t/insert.test
+share/mysql-test/t/insert_select-binlog.test
+share/mysql-test/t/insert_select.test
+share/mysql-test/t/insert_update.test
+share/mysql-test/t/isam.test
+share/mysql-test/t/join.test
+share/mysql-test/t/join_crash.test
+share/mysql-test/t/join_outer.test
+share/mysql-test/t/key.test
+share/mysql-test/t/key_cache-master.opt
+share/mysql-test/t/key_cache.test
+share/mysql-test/t/key_diff.test
+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_fs_off.test
+share/mysql-test/t/lowercase_table-master.opt
+share/mysql-test/t/lowercase_table.test
+share/mysql-test/t/lowercase_table2.test
+share/mysql-test/t/lowercase_table3-master.opt
+share/mysql-test/t/lowercase_table3.test
+share/mysql-test/t/lowercase_table_grant-master.opt
+share/mysql-test/t/lowercase_table_grant.test
+share/mysql-test/t/lowercase_table_qcache-master.opt
+share/mysql-test/t/lowercase_table_qcache.test
+share/mysql-test/t/merge.test
+share/mysql-test/t/metadata.test
+share/mysql-test/t/mix_innodb_myisam_binlog-master.opt
+share/mysql-test/t/mix_innodb_myisam_binlog.test
+share/mysql-test/t/multi_statement-master.opt
+share/mysql-test/t/multi_statement.test
+share/mysql-test/t/multi_update-master.opt
+share/mysql-test/t/multi_update.test
+share/mysql-test/t/myisam-blob-master.opt
+share/mysql-test/t/myisam-blob.test
+share/mysql-test/t/myisam.test
+share/mysql-test/t/mysql_client.test
+share/mysql-test/t/mysql_client_test.test
+share/mysql-test/t/mysql_protocols.test
+share/mysql-test/t/mysqlbinlog-master.opt
+share/mysql-test/t/mysqlbinlog.test
+share/mysql-test/t/mysqlbinlog2.test
+share/mysql-test/t/mysqldump.test
+share/mysql-test/t/mysqltest.test
+share/mysql-test/t/ndb_alter_table.test
+share/mysql-test/t/ndb_autodiscover.test
+share/mysql-test/t/ndb_autodiscover2-master.opt
+share/mysql-test/t/ndb_autodiscover2.test
+share/mysql-test/t/ndb_autodiscover3.test
+share/mysql-test/t/ndb_basic.test
+share/mysql-test/t/ndb_blob.test
+share/mysql-test/t/ndb_cache.test
+share/mysql-test/t/ndb_charset.test
+share/mysql-test/t/ndb_config.test
+share/mysql-test/t/ndb_database.test
+share/mysql-test/t/ndb_index.test
+share/mysql-test/t/ndb_index_ordered.test
+share/mysql-test/t/ndb_index_unique.test
+share/mysql-test/t/ndb_insert.test
+share/mysql-test/t/ndb_limit.test
+share/mysql-test/t/ndb_load.test
+share/mysql-test/t/ndb_loaddatalocal.test
+share/mysql-test/t/ndb_lock.test
+share/mysql-test/t/ndb_minmax.test
+share/mysql-test/t/ndb_multi.test
+share/mysql-test/t/ndb_rename.test
+share/mysql-test/t/ndb_replace.test
+share/mysql-test/t/ndb_restore.test
+share/mysql-test/t/ndb_subquery.test
+share/mysql-test/t/ndb_transaction.test
+share/mysql-test/t/ndb_truncate.test
+share/mysql-test/t/ndb_types.test
+share/mysql-test/t/ndb_update.test
+share/mysql-test/t/negation_elimination.test
+share/mysql-test/t/not_embedded_server-master.opt
+share/mysql-test/t/not_embedded_server.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/preload.test
+share/mysql-test/t/ps.test
+share/mysql-test/t/ps_10nestset.test
+share/mysql-test/t/ps_11bugs.test
+share/mysql-test/t/ps_1general.test
+share/mysql-test/t/ps_2myisam.test
+share/mysql-test/t/ps_3innodb.test
+share/mysql-test/t/ps_4heap.test
+share/mysql-test/t/ps_5merge.test
+share/mysql-test/t/ps_6bdb.test
+share/mysql-test/t/ps_7ndb.test
+share/mysql-test/t/ps_grant.test
+share/mysql-test/t/query_cache.test
+share/mysql-test/t/query_cache_merge.test
+share/mysql-test/t/query_cache_notembedded.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/replace.test
+share/mysql-test/t/rollback.test
+share/mysql-test/t/row.test
+share/mysql-test/t/rpl000001-slave.opt
+share/mysql-test/t/rpl000001.test
+share/mysql-test/t/rpl000002.test
+share/mysql-test/t/rpl000004.test
+share/mysql-test/t/rpl000005.test
+share/mysql-test/t/rpl000006.test
+share/mysql-test/t/rpl000008-slave.opt
+share/mysql-test/t/rpl000008.test
+share/mysql-test/t/rpl000009-slave.opt
+share/mysql-test/t/rpl000009.test
+share/mysql-test/t/rpl000010-slave.opt
+share/mysql-test/t/rpl000010.test
+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/rpl000015-slave.sh
+share/mysql-test/t/rpl000015.slave-mi
+share/mysql-test/t/rpl000015.test
+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-slave.opt
+share/mysql-test/t/rpl000018.test
+share/mysql-test/t/rpl_EE_error.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_charset.test
+share/mysql-test/t/rpl_commit_after_flush.test
+share/mysql-test/t/rpl_create_database-master.opt
+share/mysql-test/t/rpl_create_database-slave.opt
+share/mysql-test/t/rpl_create_database.test
+share/mysql-test/t/rpl_ddl.test
+share/mysql-test/t/rpl_deadlock-slave.opt
+share/mysql-test/t/rpl_deadlock.test
+share/mysql-test/t/rpl_delete_all.test
+share/mysql-test/t/rpl_do_grant.test
+share/mysql-test/t/rpl_drop.test
+share/mysql-test/t/rpl_drop_db.test
+share/mysql-test/t/rpl_drop_temp-slave.opt
+share/mysql-test/t/rpl_drop_temp.test
+share/mysql-test/t/rpl_dual_pos_advance-master.opt
+share/mysql-test/t/rpl_dual_pos_advance.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_failed_optimize-master.opt
+share/mysql-test/t/rpl_failed_optimize.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_flush_tables.test
+share/mysql-test/t/rpl_free_items-slave.opt
+share/mysql-test/t/rpl_free_items.test
+share/mysql-test/t/rpl_get_lock.test
+share/mysql-test/t/rpl_heap.test
+share/mysql-test/t/rpl_ignore_grant-slave.opt
+share/mysql-test/t/rpl_ignore_grant.test
+share/mysql-test/t/rpl_ignore_table-slave.opt
+share/mysql-test/t/rpl_ignore_table.test
+share/mysql-test/t/rpl_init_slave-slave.opt
+share/mysql-test/t/rpl_init_slave.test
+share/mysql-test/t/rpl_innodb.test
+share/mysql-test/t/rpl_insert_id-slave.opt
+share/mysql-test/t/rpl_insert_id.test
+share/mysql-test/t/rpl_insert_ignore-slave.opt
+share/mysql-test/t/rpl_insert_ignore.test
+share/mysql-test/t/rpl_insert_select.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_many_optimize.test
+share/mysql-test/t/rpl_master_pos_wait.test
+share/mysql-test/t/rpl_max_relay_size.test
+share/mysql-test/t/rpl_misc_functions-slave.sh
+share/mysql-test/t/rpl_misc_functions.test
+share/mysql-test/t/rpl_multi_delete-slave.opt
+share/mysql-test/t/rpl_multi_delete.test
+share/mysql-test/t/rpl_multi_delete2-slave.opt
+share/mysql-test/t/rpl_multi_delete2.test
+share/mysql-test/t/rpl_multi_query.test
+share/mysql-test/t/rpl_multi_update.test
+share/mysql-test/t/rpl_multi_update2-slave.opt
+share/mysql-test/t/rpl_multi_update2.test
+share/mysql-test/t/rpl_multi_update3.test
+share/mysql-test/t/rpl_multi_update4-slave.opt
+share/mysql-test/t/rpl_multi_update4.test
+share/mysql-test/t/rpl_mystery22.test
+share/mysql-test/t/rpl_openssl.test
+share/mysql-test/t/rpl_optimize.test
+share/mysql-test/t/rpl_ps.test
+share/mysql-test/t/rpl_redirect.test
+share/mysql-test/t/rpl_relayrotate-slave.opt
+share/mysql-test/t/rpl_relayrotate.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_rewrite_db-slave.opt
+share/mysql-test/t/rpl_rewrite_db.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
+share/mysql-test/t/rpl_rotate_logs.test
+share/mysql-test/t/rpl_server_id1.test
+share/mysql-test/t/rpl_server_id2-slave.opt
+share/mysql-test/t/rpl_server_id2.test
+share/mysql-test/t/rpl_set_charset.test
+share/mysql-test/t/rpl_skip_error-slave.opt
+share/mysql-test/t/rpl_skip_error.test
+share/mysql-test/t/rpl_slave_status.test
+share/mysql-test/t/rpl_sporadic_master-master.opt
+share/mysql-test/t/rpl_sporadic_master.test
+share/mysql-test/t/rpl_start_stop_slave.test
+share/mysql-test/t/rpl_temporary.test
+share/mysql-test/t/rpl_timezone-master.opt
+share/mysql-test/t/rpl_timezone-slave.opt
+share/mysql-test/t/rpl_timezone.test
+share/mysql-test/t/rpl_trunc_binlog.test
+share/mysql-test/t/rpl_trunc_temp.test
+share/mysql-test/t/rpl_until.test
+share/mysql-test/t/rpl_user_variables.test
+share/mysql-test/t/rpl_variables.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/skip_name_resolve-master.opt
+share/mysql-test/t/skip_name_resolve.test
+share/mysql-test/t/sql_mode.test
+share/mysql-test/t/status.test
+share/mysql-test/t/subselect.test
+share/mysql-test/t/subselect2.test
+share/mysql-test/t/subselect_gis.test
+share/mysql-test/t/subselect_innodb.test
+share/mysql-test/t/symlink.test
+share/mysql-test/t/synchronization.test
+share/mysql-test/t/system_mysql_db.test
+share/mysql-test/t/system_mysql_db_fix-master.opt
+share/mysql-test/t/system_mysql_db_fix.test
+share/mysql-test/t/system_mysql_db_refs.test
+share/mysql-test/t/tablelock.test
+share/mysql-test/t/temp_table-master.opt
+share/mysql-test/t/temp_table.test
+share/mysql-test/t/timezone-master.opt
+share/mysql-test/t/timezone.test
+share/mysql-test/t/timezone2.test
+share/mysql-test/t/timezone3-master.opt
+share/mysql-test/t/timezone3.test
+share/mysql-test/t/timezone_grant.test
+share/mysql-test/t/truncate.test
+share/mysql-test/t/type_blob.test
+share/mysql-test/t/type_date.test
+share/mysql-test/t/type_datetime.test
+share/mysql-test/t/type_decimal.test
+share/mysql-test/t/type_enum.test
+share/mysql-test/t/type_float.test
+share/mysql-test/t/type_nchar.test
+share/mysql-test/t/type_ranges.test
+share/mysql-test/t/type_set.test
+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-master.opt
+share/mysql-test/t/union.test
+share/mysql-test/t/update.test
+share/mysql-test/t/user_var-binlog.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/wait_timeout-master.opt
+share/mysql-test/t/wait_timeout.test
+share/mysql-test/t/warnings-master.opt
+share/mysql-test/t/warnings.test
+share/mysql-test/t/windows.test
+share/mysql/charsets/Index.xml
+share/mysql/charsets/README
+share/mysql/charsets/armscii8.xml
+share/mysql/charsets/ascii.xml
+share/mysql/charsets/cp1250.xml
+share/mysql/charsets/cp1251.xml
+share/mysql/charsets/cp1256.xml
+share/mysql/charsets/cp1257.xml
+share/mysql/charsets/cp850.xml
+share/mysql/charsets/cp852.xml
+share/mysql/charsets/cp866.xml
+share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
+share/mysql/charsets/greek.xml
+share/mysql/charsets/hebrew.xml
+share/mysql/charsets/hp8.xml
+share/mysql/charsets/keybcs2.xml
+share/mysql/charsets/koi8r.xml
+share/mysql/charsets/koi8u.xml
+share/mysql/charsets/latin1.xml
+share/mysql/charsets/latin2.xml
+share/mysql/charsets/latin5.xml
+share/mysql/charsets/latin7.xml
+share/mysql/charsets/macce.xml
+share/mysql/charsets/macroman.xml
+share/mysql/charsets/swe7.xml
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/danish/errmsg.sys
+share/mysql/danish/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
+share/mysql/english/errmsg.sys
+share/mysql/english/errmsg.txt
+share/mysql/estonian/errmsg.sys
+share/mysql/estonian/errmsg.txt
+share/mysql/french/errmsg.sys
+share/mysql/french/errmsg.txt
+share/mysql/german/errmsg.sys
+share/mysql/german/errmsg.txt
+share/mysql/greek/errmsg.sys
+share/mysql/greek/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-sjis/errmsg.sys
+share/mysql/japanese-sjis/errmsg.txt
+share/mysql/japanese/errmsg.sys
+share/mysql/japanese/errmsg.txt
+share/mysql/korean/errmsg.sys
+share/mysql/korean/errmsg.txt
+share/mysql/mi_test_all
+share/mysql/mi_test_all.res
+share/mysql/mysql.server
+share/mysql/norwegian-ny/errmsg.sys
+share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
+share/mysql/portuguese/errmsg.sys
+share/mysql/portuguese/errmsg.txt
+share/mysql/romanian/errmsg.sys
+share/mysql/romanian/errmsg.txt
+share/mysql/russian/errmsg.sys
+share/mysql/russian/errmsg.txt
+share/mysql/serbian/errmsg.sys
+share/mysql/serbian/errmsg.txt
+share/mysql/slovak/errmsg.sys
+share/mysql/slovak/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
+share/mysql/ukrainian/errmsg.sys
+share/mysql/ukrainian/errmsg.txt
+@dirrm share/mysql/ukrainian
+@dirrm share/mysql/swedish
+@dirrm share/mysql/spanish
+@dirrm share/mysql/slovak
+@dirrm share/mysql/serbian
+@dirrm share/mysql/russian
+@dirrm share/mysql/romanian
+@dirrm share/mysql/portuguese
+@dirrm share/mysql/polish
+@dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/norwegian
+@dirrm share/mysql/korean
+@dirrm share/mysql/japanese-sjis
+@dirrm share/mysql/japanese
+@dirrm share/mysql/italian
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/greek
+@dirrm share/mysql/german
+@dirrm share/mysql/french
+@dirrm share/mysql/estonian
+@dirrm share/mysql/english
+@dirrm share/mysql/dutch
+@dirrm share/mysql/danish
+@dirrm share/mysql/czech
+@dirrm share/mysql/charsets
+@dirrm share/mysql-test/t
+@dirrm share/mysql-test/std_data
+@dirrm share/mysql-test/r
+@dirrm share/mysql-test/lib
+@dirrm share/mysql-test/include
+@dirrm share/mysql-test
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
new file mode 100644
index 00000000000..4953e1f4eb3
--- /dev/null
+++ b/databases/mysql4-server/distinfo
@@ -0,0 +1,22 @@
+$NetBSD: distinfo,v 1.30 2008/03/26 13:22:00 wiz Exp $
+
+SHA1 (mysql-4.1.22.tar.gz) = 857e942cc3207caf56e2aa48961fc1ed66d932e6
+RMD160 (mysql-4.1.22.tar.gz) = bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e
+Size (mysql-4.1.22.tar.gz) = 17761101 bytes
+SHA1 (patch-aa) = b6fb450e431b4ec6ebf7bc4b04cd80f7756576c5
+SHA1 (patch-ab) = 1ad80e212ab9fe37f3026ed37dfa8f25371f9216
+SHA1 (patch-ac) = 5d313195f290d1761d3f2f0143f44cd8143a70c5
+SHA1 (patch-ad) = d2a7e9b90c3980090e40e29aa478310ac9862b1f
+SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (patch-af) = 3189f162cd0088861040e60486878ad42e92bc0d
+SHA1 (patch-al) = 4281434afd098abffde061964e10abf307bd759f
+SHA1 (patch-am) = e809cbead263d80862866f534a58797d1f486a3b
+SHA1 (patch-aq) = d1ec2ddc51159c29c5ada5f5451d2f4c894cd924
+SHA1 (patch-ar) = 834a6c21ddfeacaa964df32d19360b9c90e05857
+SHA1 (patch-as) = 9a983228aae8712c15009015f4e76faa2872d73f
+SHA1 (patch-aw) = e89b4ada1a6efa2d8fb2ddaed8eaca6a59603d38
+SHA1 (patch-ax) = c73f0d59c9e079abc8fc16965297257cb8f8a592
+SHA1 (patch-bd) = 6eb42818196f0a981e7d85fa5791030483a037c4
+SHA1 (patch-be) = 9cb9e8fe550e168a67cd90d0fd7fc6cc9d4029d5
+SHA1 (patch-bf) = 1bbcdd13fa662e2b17114b8b390d16cebccf389c
+SHA1 (patch-bg) = e388cbafcc2d6eff1df881984442f34bdb7c07f6
diff --git a/databases/mysql4-server/files/mysqld.sh b/databases/mysql4-server/files/mysqld.sh
new file mode 100644
index 00000000000..c5ec57afff1
--- /dev/null
+++ b/databases/mysql4-server/files/mysqld.sh
@@ -0,0 +1,103 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: mysqld.sh,v 1.6 2008/03/26 13:22:00 wiz Exp $
+#
+# PROVIDE: mysqld
+# REQUIRE: DAEMON LOGIN mountall
+# KEYWORD: shutdown
+#
+# You will need to set some variables in /etc/rc.conf to start MySQL:
+#
+# mysqld=YES
+#
+# The following variables are optional:
+#
+#       mysqld_user="mysql"		# user to run mysqld as
+#       mysqld_datadir="/path/to/home"	# path to MySQL database directory
+#
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="mysqld"
+rcvar=${name}
+command="@PREFIX@/bin/mysqld_safe"
+procname="@PREFIX@/libexec/${name}"
+: ${mysqld_user:=@MYSQL_USER@}
+: ${mysqld_group:=@MYSQL_GROUP@}
+: ${mysqld_datadir:=@MYSQL_DATADIR@}
+pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+
+extra_commands="initdb"
+initdb_cmd="mysqld_initdb"
+start_precmd="mysqld_precmd"
+start_cmd="mysqld_start"
+
+mysqld_precmd()
+{
+	if [ ! -d ${mysqld_datadir} ]; then
+		mysqld_initdb
+	fi
+}
+
+mysqld_initdb()
+{
+	initdb="@PREFIX@/bin/mysql_install_db"
+	if [ ! -x ${initdb} ]; then
+		return 1
+	fi
+	if [ -f ${mysqld_datadir}/mysql/host.frm ]; then
+		@ECHO@ "The MySQL database has already been initialized."
+		@ECHO@ "Skipping database initialization."
+	else
+		@ECHO@ "Initializing MySQL database system tables."
+		${initdb} --force --user=${mysqld_user} \
+			  --datadir=${mysqld_datadir} || return 1
+		if [ -d ${mysqld_datadir} ]; then
+			@CHOWN@ -R ${mysqld_user}:${mysqld_group} \
+				${mysqld_datadir}
+		fi
+	fi
+}
+
+mysqld_start()
+{
+	for f in $required_files; do
+		if [ ! -r "$f" ]; then
+			@ECHO@ 1>&2 "$0: WARNING: $f is not readable"
+			if [ -z $rc_force ]; then
+				return 1
+			fi
+		fi
+	done
+	@ECHO@ "Starting ${name}."
+	ulimit -n 4096
+	cd @PREFIX@
+	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
+		   --pid-file=${pidfile} ${mysqld_flags} &
+}
+
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	if [ -f /etc/rc.conf ]; then
+		. /etc/rc.conf
+	fi
+	case "$1" in
+	initdb)
+		eval ${initdb_cmd}
+		;;
+	stop)
+		if [ -r "${pidfile}" ]; then
+			@ECHO@ "Stopping ${name}."
+			kill `@CAT@ ${pidfile}`
+		fi
+		;;
+	*)
+		eval ${start_precmd}
+		eval ${start_cmd}
+		;;
+	esac
+fi
diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa
new file mode 100644
index 00000000000..9642bd7fe5f
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.13 2008/03/26 13:22:00 wiz Exp $
+
+--- Makefile.in.orig	2006-11-03 04:19:15.000000000 +0200
++++ Makefile.in	2007-05-23 08:52:06.000000000 +0300
+@@ -353,12 +353,8 @@
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
+ 
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
+-			@readline_topdir@ sql-common \
+-			@thread_dirs@ pstack \
+-			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			netware @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
++SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \
++	@bench_dirs@ support-files
+ 
+ DIST_SUBDIRS = . include @docs_dirs@ zlib \
+ 			@readline_topdir@ sql-common \
diff --git a/databases/mysql4-server/patches/patch-ab b/databases/mysql4-server/patches/patch-ab
new file mode 100644
index 00000000000..cae82688201
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.7 2008/03/26 13:22:00 wiz Exp $
+
+--- tests/Makefile.in.orig	2006-11-03 04:19:11.000000000 +0200
++++ tests/Makefile.in	2007-05-23 08:52:31.000000000 +0300
+@@ -75,7 +75,7 @@
+ insert_test_LDADD = $(LDADD)
+ am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT)
+ mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
+-am__DEPENDENCIES_1 = ../libmysql/libmysqlclient.la
++am__DEPENDENCIES_1 =
+ am__DEPENDENCIES_2 =
+ mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
+@@ -85,7 +85,7 @@
+ thread_test_SOURCES = thread_test.c
+ thread_test_OBJECTS = thread_test.$(OBJEXT)
+ thread_test_LDADD = $(LDADD)
+-thread_test_DEPENDENCIES = ../libmysql/libmysqlclient.la
++thread_test_DEPENDENCIES =
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -378,7 +378,7 @@
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ 			$(openssl_includes)
+ 
+-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
++LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
+ mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
+ mysql_client_test_SOURCES = mysql_client_test.c
+ insert_test_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES)
diff --git a/databases/mysql4-server/patches/patch-ac b/databases/mysql4-server/patches/patch-ac
new file mode 100644
index 00000000000..c347301187b
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.9 2008/03/26 13:22:00 wiz Exp $
+
+--- mysql-test/Makefile.in.orig	2006-11-03 04:18:36.000000000 +0200
++++ mysql-test/Makefile.in	2007-05-23 08:52:54.000000000 +0300
+@@ -372,7 +372,7 @@
+ @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
+ @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
+ benchdir_root = $(prefix)
+-testdir = $(benchdir_root)/mysql-test
++testdir = $(benchdir_root)/share/mysql-test
+ EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS)
+ EXTRA_DIST = $(EXTRA_SCRIPTS) 
+ GENSCRIPTS = mysql-test-run install_test_db mtr
diff --git a/databases/mysql4-server/patches/patch-ad b/databases/mysql4-server/patches/patch-ad
new file mode 100644
index 00000000000..12e47636ff4
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- sql/mysqld.cc.orig	2006-11-03 04:15:29.000000000 +0200
++++ sql/mysqld.cc	2007-05-23 08:53:13.000000000 +0300
+@@ -183,7 +183,7 @@
+ int initgroups(const char *,unsigned int);
+ #endif
+ 
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
+ #include <ieeefp.h>
+ #ifdef HAVE_FP_EXCEPT				// Fix type conflict
+ typedef fp_except fp_except_t;
diff --git a/databases/mysql4-server/patches/patch-ae b/databases/mysql4-server/patches/patch-ae
new file mode 100644
index 00000000000..86543d31746
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2008/03/26 13:22:00 wiz Exp $
+
+--- mysys/my_gethwaddr.c.orig	2005-10-14 10:21:10.000000000 +0000
++++ mysys/my_gethwaddr.c
+@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
+   return res;
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <net/ethernet.h>
+ #include <sys/sysctl.h>
diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af
new file mode 100644
index 00000000000..1ec0c22a157
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-af
@@ -0,0 +1,67 @@
+$NetBSD: patch-af,v 1.12 2008/03/26 13:22:00 wiz Exp $
+
+--- configure.orig	2006-11-03 04:19:18.000000000 +0200
++++ configure	2007-05-23 08:53:36.000000000 +0300
+@@ -20547,7 +20547,7 @@
+   FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
+ else
+   case $SYSTEM_TYPE in
+-    *freebsd*)
++    *freebsd* | *dragonfly*)
+       FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
+       ;;
+     *darwin*)
+@@ -24736,6 +24736,10 @@
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
++  *dragonfly*)
++    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    ;;
++    
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
+@@ -36636,33 +36640,10 @@
+ fi;
+ 
+ 
+-echo "$as_me:$LINENO: checking for ORBit" >&5
+-echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
+-orbit_config_path=`which orbit-config`
+-if test -n "$orbit_config_path" -a $? = 0
+-then
+-  orbit_exec_prefix=`orbit-config --exec-prefix`
+-  orbit_includes=`orbit-config --cflags server`
+-  orbit_libs=`orbit-config --libs server`
+-  orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
+-  echo "$as_me:$LINENO: result: found!" >&5
+-echo "${ECHO_T}found!" >&6
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ORBIT 1
+-_ACEOF
+-
+-else
+   orbit_exec_prefix=
+   orbit_includes=
+   orbit_libs=
+   orbit_idl=
+-  echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-fi
+-
+-
+-
+ 
+ 
+   echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
+@@ -37071,7 +37052,7 @@
+ main ()
+ {
+ 
+-		char res= *(*rl_completion_entry_function)(0,0);
++		char res=(*rl_completion_entry_function)(0,0);
+ 		completion_matches(0,0);
+ 
+   ;
diff --git a/databases/mysql4-server/patches/patch-al b/databases/mysql4-server/patches/patch-al
new file mode 100644
index 00000000000..b76ec922ae3
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-al
@@ -0,0 +1,30 @@
+$NetBSD: patch-al,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- include/my_pthread.h.orig	2006-11-03 04:15:38.000000000 +0200
++++ include/my_pthread.h	2007-05-23 08:54:00.000000000 +0300
+@@ -19,7 +19,13 @@
+ #ifndef _my_pthread_h
+ #define _my_pthread_h
+ 
++/* defines __NetBSD_Version__ */
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
+ #include <errno.h>
++#include <signal.h>
+ #ifndef ETIME
+ #define ETIME ETIMEDOUT				/* For FreeBSD */
+ #endif
+@@ -297,7 +303,11 @@
+ #endif
+ 
+ #ifndef HAVE_NONPOSIX_SIGWAIT
++#if defined (__NetBSD__) && (__NetBSD_Version__ < 106130000)
++#define my_sigwait(A,B) __pthread_sigwait((A),(B))
++#else
+ #define my_sigwait(A,B) sigwait((A),(B))
++#endif
+ #else
+ int my_sigwait(const sigset_t *set,int *sig);
+ #endif
diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am
new file mode 100644
index 00000000000..025b20bc0c7
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-am
@@ -0,0 +1,103 @@
+$NetBSD: patch-am,v 1.10 2008/03/26 13:22:00 wiz Exp $
+
+--- scripts/mysqld_safe.sh.orig	2007-05-23 08:51:42.000000000 +0300
++++ scripts/mysqld_safe.sh	2007-05-23 08:54:22.000000000 +0300
+@@ -311,6 +311,14 @@
+   fi
+ fi
+ 
++datemsg()
++{
++	echo -n $(date +'%y%M%d %H:%M:%S')"  "
++	echo "$*"
++}
++
++exec >>$err_log 2>&1
++
+ #
+ # If there exists an old pid file, check if the daemon is already running
+ # Note: The switches to 'ps' may depend on your operating system
+@@ -321,18 +329,16 @@
+   then
+     if @FIND_PROC@
+     then    # The pid contains a mysqld process
+-      echo "A mysqld process already exists"
+-      echo "A mysqld process already exists at " `date` >> $err_log
++	    datemsg "A mysqld process already exists"
+       exit 1
+     fi
+   fi
+   rm -f $pid_file
+   if test -f $pid_file
+   then
+-    echo "Fatal error: Can't remove the pid file: $pid_file"
+-    echo "Fatal error: Can't remove the pid file: $pid_file at " `date` >> $err_log
+-    echo "Please remove it manually and start $0 again"
+-    echo "mysqld daemon not started"
++	datemsg "Fatal error: Can't remove the pid file: $pid_file"
++	datemsg "Please remove it manually and start $0 again"
++	datemsg "mysqld daemon not started"
+     exit 1
+   fi
+ fi
+@@ -345,11 +351,11 @@
+ # Alternatively, you can start mysqld with the "myisam-recover" option. See
+ # the manual for details.
+ #
+-# echo "Checking tables in $DATADIR"
++# datemsg "Checking tables in $DATADIR"
+ # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI
+ # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM
+ 
+-echo "Starting $MYSQLD daemon with databases from $DATADIR"
++datemsg "Starting $MYSQLD daemon with databases from $DATADIR"
+ 
+ # Does this work on all systems?
+ #if type ulimit | grep "shell builtin" > /dev/null
+@@ -357,7 +363,7 @@
+ #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
+ #fi
+ 
+-echo "`date +'%y%m%d %H:%M:%S  mysqld started'`" >> $err_log
++datemsg "mysqld started"
+ while true
+ do
+   rm -f $safe_mysql_unix_port $pid_file	# Some extra safety
+@@ -369,7 +375,7 @@
+   fi
+   if test ! -f $pid_file		# This is removed if normal shutdown
+   then
+-    echo "STOPPING server from pid file $pid_file"
++    datemsg "STOPPING server from pid file $pid_file"
+     break
+   fi
+ 
+@@ -382,7 +388,7 @@
+     # kill -9 is used or the process won't react on the kill.
+     numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
+ 
+-    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
++    datemsg -e "\nNumber of processes running now: $numofproces"
+     I=1
+     while test "$I" -le "$numofproces"
+     do 
+@@ -395,16 +401,14 @@
+       #    echo "TEST $I - $T **"
+       if kill -9 $T
+       then
+-        echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
++        datemsg "$MYSQLD process hanging, pid $T - killed"
+       else 
+         break
+       fi
+       I=`expr $I + 1`
+     done
+   fi
+-  echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
++  datemsg "mysqld restarted"
+ done
+ 
+-echo "`date +'%y%m%d %H:%M:%S'`  mysqld ended" | tee -a $err_log
+-echo "" | tee -a $err_log
+-
++datemsg "mysqld ended"
diff --git a/databases/mysql4-server/patches/patch-aq b/databases/mysql4-server/patches/patch-aq
new file mode 100644
index 00000000000..ae30c98fe01
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-aq
@@ -0,0 +1,21 @@
+$NetBSD: patch-aq,v 1.8 2008/03/26 13:22:00 wiz Exp $
+
+--- include/Makefile.in.orig	2006-11-03 04:18:30.000000000 +0200
++++ include/Makefile.in	2007-05-23 08:54:47.000000000 +0300
+@@ -336,14 +336,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
+-BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
+-pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
+-			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
+-		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+-			errmsg.h my_global.h my_net.h my_alloc.h \
+-			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
+-			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+-			sql_state.h mysql_time.h $(BUILT_SOURCES)
++BUILT_SOURCES =
++pkginclude_HEADERS = 
+ 
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ 			nisam.h heap.h merge.h my_bitmap.h\
diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar
new file mode 100644
index 00000000000..b04edd7bb53
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.10 2008/03/26 13:22:00 wiz Exp $
+
+--- man/Makefile.in.orig	2006-11-03 04:18:34.000000000 +0200
++++ man/Makefile.in	2007-05-23 08:56:31.000000000 +0300
+@@ -327,8 +327,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
+-man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
++man1_MANS = isamchk.1 isamlog.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 pack_isam.1 perror.1 replace.1
++man8_MANS = mysqld.8
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ all: all-am
+ 
diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as
new file mode 100644
index 00000000000..547928bbe83
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-as
@@ -0,0 +1,20 @@
+$NetBSD: patch-as,v 1.11 2008/03/26 13:22:00 wiz Exp $
+
+--- support-files/Makefile.in.orig	2006-11-03 04:19:11.000000000 +0200
++++ support-files/Makefile.in	2007-05-23 08:56:53.000000000 +0300
+@@ -358,14 +358,7 @@
+ 			ndb-config-2-node.ini.sh
+ 
+ SUBDIRS = MacOSX
+-pkgdata_DATA = my-small.cnf \
+-			my-medium.cnf \
+-			my-large.cnf \
+-			my-huge.cnf \
+-      my-innodb-heavy-4G.cnf \
+-			mysql-log-rotate \
+-			binary-configure \
+-			ndb-config-2-node.ini
++pkgdata_DATA =
+ 
+ pkgdata_SCRIPTS = mysql.server
+ noinst_DATA = mysql-@VERSION@.spec \
diff --git a/databases/mysql4-server/patches/patch-aw b/databases/mysql4-server/patches/patch-aw
new file mode 100644
index 00000000000..560a066f74e
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.5 2008/03/26 13:22:00 wiz Exp $
+
+--- isam/Makefile.in.orig	2006-04-29 05:36:29.000000000 +0000
++++ isam/Makefile.in
+@@ -119,7 +119,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
++CCLD = $(CXX)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \
diff --git a/databases/mysql4-server/patches/patch-ax b/databases/mysql4-server/patches/patch-ax
new file mode 100644
index 00000000000..a86cecce7ca
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.5 2008/03/26 13:22:00 wiz Exp $
+
+--- myisam/Makefile.in.orig	2006-04-29 05:36:32.000000000 +0000
++++ myisam/Makefile.in
+@@ -141,7 +141,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
++CCLD = $(CXX)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \
diff --git a/databases/mysql4-server/patches/patch-bd b/databases/mysql4-server/patches/patch-bd
new file mode 100644
index 00000000000..44826ee7433
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-bd
@@ -0,0 +1,69 @@
+$NetBSD: patch-bd,v 1.5 2008/03/26 13:22:00 wiz Exp $
+
+--- tests/mysql_client_test.c.orig	2006-11-03 04:15:21.000000000 +0200
++++ tests/mysql_client_test.c	2007-05-23 08:57:25.000000000 +0300
+@@ -22,6 +22,7 @@
+ ***************************************************************************/
+ 
+ #include <my_global.h>
++#include <mysqld_error.h>
+ #include <my_sys.h>
+ #include <mysql.h>
+ #include <errmsg.h>
+@@ -11856,6 +11857,48 @@
+   mysql_stmt_close(stmt);
+ }
+ 
++/*
++  Bug #17667: An attacker has the opportunity to bypass query logging.
++ */
++
++static void test_bug17667()
++{
++  NET *net= &mysql->net;
++  int rc;
++  myheader("test_bug17667");
++
++  /* I. Prepare the table */
++  mysql_real_query(mysql,     "drop table if exists t1", 23);
++
++  rc= mysql_real_query(mysql, "create table t1 (i int)", 23);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "insert into t1 (i) values (1)", 29);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "insert into /* NUL=\0 */ t1 (i) values (2)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == ER_PARSE_ERROR);
++
++  mysql_real_query(mysql,     "/* NUL=\0 */ insert into t1 (i) values (3)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == ER_PARSE_ERROR);
++
++  mysql_real_query(mysql,     "insert into /* TAB=\t */ t1 (i) values (4)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "/* TAB=\t */ insert into t1 (i) values (5)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  /* II. Cleanup */
++  rc= mysql_real_query(mysql, "drop table t1", 13);
++  myquery(rc);
++}
++
+ 
+ /*
+  Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
+@@ -12170,6 +12213,7 @@
+   { "test_bug11718", test_bug11718 },
+   { "test_bug12925", test_bug12925 },
+   { "test_bug15613", test_bug15613 },
++  { "test_bug17667", test_bug17667 },
+   { "test_bug20152", test_bug20152 },
+   { "test_bug21726", test_bug21726 },
+   { 0, 0 }
diff --git a/databases/mysql4-server/patches/patch-be b/databases/mysql4-server/patches/patch-be
new file mode 100644
index 00000000000..2dc8de240fe
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- sql/sql_lex.cc.orig	2006-11-03 04:15:21.000000000 +0200
++++ sql/sql_lex.cc	2007-05-23 08:57:51.000000000 +0300
+@@ -894,6 +894,8 @@
+       while (lex->ptr != lex->end_of_query &&
+ 	     ((c=yyGet()) != '*' || yyPeek() != '/'))
+       {
++	if (c == '\0')
++	  return(ABORT_SYM);		// NULLs illegal even in comments
+ 	if (c == '\n')
+ 	  lex->yylineno++;
+       }
diff --git a/databases/mysql4-server/patches/patch-bf b/databases/mysql4-server/patches/patch-bf
new file mode 100644
index 00000000000..ff21c8ba1d3
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+--- bdb/dist/configure.orig	2006-10-15 22:12:09.000000000 +0000
++++ bdb/dist/configure
+@@ -5038,7 +5038,7 @@ fi
+ # we're using.
+ case "$host_os" in
+ sysv5UnixWare*|sysv5OpenUNIX8*)
+-	if test "$GCC" == "yes"; then
++	if test "$GCC" = "yes"; then
+ 		CPPFLAGS="$CPPFLAGS -pthread"
+ 		LDFLAGS="$LDFLAGS -pthread"
+ 	else
diff --git a/databases/mysql4-server/patches/patch-bg b/databases/mysql4-server/patches/patch-bg
new file mode 100644
index 00000000000..c846ce789d9
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-bg
@@ -0,0 +1,13 @@
+$NetBSD: patch-bg,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+--- sql/sql_parse.cc.orig	2006-11-03 02:17:00.000000000 +0000
++++ sql/sql_parse.cc
+@@ -2736,7 +2736,7 @@ unsent_create_error:
+ 	old_list=table[0];
+ 	new_list=table->next[0];
+ 	old_list.next=new_list.next=0;
+-	if (check_grant(thd, ALTER_ACL, &old_list, 0, UINT_MAX, 0) ||
++	if (check_grant(thd, ALTER_ACL | DROP_ACL, &old_list, 0, UINT_MAX, 0) ||
+ 	    (!test_all_bits(table->next->grant.privilege,
+ 			    INSERT_ACL | CREATE_ACL) &&
+ 	     check_grant(thd, INSERT_ACL | CREATE_ACL, &new_list, 0,