Pullup ticket #2532 - requested by taca

mysql5-client: security update mysql5-server: security update Revisions pulled up: - databases/mysql5-client/Makefile 1.19 - databases/mysql5-client/Makefile.common 1.33 - databases/mysql5-client/buildlink3.mk 1.12 - databases/mysql5-client/distinfo 1.24 - databases/mysql5-client/patches/patch-ab 1.3 - databases/mysql5-client/patches/patch-ac 1.7 - databases/mysql5-client/patches/patch-af 1.7 - databases/mysql5-client/patches/patch-ag 1.4 - databases/mysql5-client/patches/patch-aj 1.3 - databases/mysql5-client/patches/patch-ak delete - databases/mysql5-client/patches/patch-al 1.3 - databases/mysql5-server/Makefile 1.25 - databases/mysql5-server/PLIST 1.13 - databases/mysql5-server/distinfo 1.21 - databases/mysql5-server/patches/patch-ad 1.4 - databases/mysql5-server/patches/patch-ag 1.7 - databases/mysql5-server/patches/patch-ai 1.3 - databases/mysql5-server/patches/patch-an 1.5 - databases/mysql5-server/patches/patch-ca 1.2 - databases/mysql5-server/patches/patch-cb 1.2 - databases/mysql5-server/patches/patch-cc 1.2 - databases/mysql5-server/patches/patch-da delete - databases/mysql5-server/patches/patch-db delete --- Module Name: pkgsrc Committed By: taca Date: Thu Sep 18 11:50:44 UTC 2008 Modified Files: pkgsrc/databases/mysql5-client: Makefile.common buildlink3.mk distinfo pkgsrc/databases/mysql5-client/patches: patch-ab patch-af patch-ag patch-aj patch-al Added Files: pkgsrc/databases/mysql5-client/patches: patch-ac Removed Files: pkgsrc/databases/mysql5-client/patches: patch-ak Log Message: Update mysql5-client pacakge to 5.0.67. For complete changes, please refer http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-67.html. Here is a part of it. Functionality added or changed: Security Enhancement: To enable stricter control over the location from which user-defined functions can be loaded, the plugin_dir system variable has been backported from MySQL 5.1. If the value is non-empty, user-defined function object files can be loaded only from the directory named by this variable. If the value is empty, the behavior that is used before 5.0.67 applies: The UDF object files must be located in a directory that is searched by your system's dynamic linker. (Bug#37428) Important Change: Incompatible Change: The FEDERATED storage engine is now disabled by default in the .cnf files shipped with MySQL distributions (my-huge.cnf, my-medium.cnf, and so forth). This affects server behavior only if you install one of these files. (Bug#37069) Cluster API: Important Change: Because NDB_LE_MemoryUsage.page_size_kb shows memory page sizes in bytes rather than kilobytes, it has been renamed to page_size_bytes. The name page_size_kb is now deprecated and thus subject to removal in a future release, although it currently remains supported for reasons of backward compatibility. See The Ndb_logevent_type Type, for more information about NDB_LE_MemoryUsage. (Bug#30271) Important Change: Some changes were made to CHECK TABLE ... FOR UPGRADE and REPAIR TABLE with respect to detection and handling of tables with incompatible .frm files (files created with a different version of the MySQL server). These changes also affect mysqlcheck because that program uses CHECK TABLE and REPAIR table, and thus also mysql_upgrade because that program invokes mysqlcheck. --- Module Name: pkgsrc Committed By: taca Date: Thu Sep 18 11:51:37 UTC 2008 Modified Files: pkgsrc/databases/mysql5-server: Makefile PLIST distinfo pkgsrc/databases/mysql5-server/patches: patch-ad patch-ag patch-ai patch-an patch-ca patch-cb patch-cc Removed Files: pkgsrc/databases/mysql5-server/patches: patch-da patch-db Log Message: Update mysql5-server pacakge to 5.0.67. This is security fix. For complete changes, please refer http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-67.html. Here is a part of it. Functionality added or changed: Security Enhancement: To enable stricter control over the location from which user-defined functions can be loaded, the plugin_dir system variable has been backported from MySQL 5.1. If the value is non-empty, user-defined function object files can be loaded only from the directory named by this variable. If the value is empty, the behavior that is used before 5.0.67 applies: The UDF object files must be located in a directory that is searched by your system's dynamic linker. (Bug#37428) Important Change: Incompatible Change: The FEDERATED storage engine is now disabled by default in the .cnf files shipped with MySQL distributions (my-huge.cnf, my-medium.cnf, and so forth). This affects server behavior only if you install one of these files. (Bug#37069) Cluster API: Important Change: Because NDB_LE_MemoryUsage.page_size_kb shows memory page sizes in bytes rather than kilobytes, it has been renamed to page_size_bytes. The name page_size_kb is now deprecated and thus subject to removal in a future release, although it currently remains supported for reasons of backward compatibility. See The Ndb_logevent_type Type, for more information about NDB_LE_MemoryUsage. (Bug#30271) Important Change: Some changes were made to CHECK TABLE ... FOR UPGRADE and REPAIR TABLE with respect to detection and handling of tables with incompatible .frm files (files created with a different version of the MySQL server). These changes also affect mysqlcheck because that program uses CHECK TABLE and REPAIR table, and thus also mysql_upgrade because that program invokes mysqlcheck. --- Module Name: pkgsrc Committed By: tron Date: Thu Sep 18 12:49:40 UTC 2008 Modified Files: pkgsrc/databases/mysql5-client: Makefile Log Message: Fix path to Perl interpreter in the installed scripts. Bump package revision because of this fix.
author: tron <tron@pkgsrc.org> 2008-09-23 11:15:53 +0000
committer: tron <tron@pkgsrc.org> 2008-09-23 11:15:53 +0000
commit: c9fd472ba51ec9d4741b2a5efd07dd10324cd651 (patch)
tree: 8fb24b82c7a191fd8a54056069a08cf8827a424d
parent: ac2c06ecc724e4fe7f2a031fcb5000992e58e424 (diff)
download: pkgsrc-c9fd472ba51ec9d4741b2a5efd07dd10324cd651.tar.gz
23 files changed, 612 insertions, 277 deletions
diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 3e32236c935..8ab196a6498 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2008/06/30 12:01:47 martti Exp $
+# $NetBSD: Makefile,v 1.18.4.1 2008/09/23 11:15:53 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
+PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, a free SQL database (client)
 
@@ -18,6 +19,12 @@ INFO_FILES=		yes
 
 AUTO_MKDIRS=	yes
 
+REPLACE_PERL=	scripts/mysql_convert_table_format.sh \
+		scripts/mysql_explain_log.sh \
+		scripts/mysql_tableinfo.sh \
+		scripts/mysqldumpslow.sh \
+		scripts/mysqlhotcopy.sh
+
 post-install:
 	cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index dc26ac7ee2c..4f2c1138f24 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile.common,v 1.32 2008/06/30 12:01:47 martti Exp $
+# $NetBSD: Makefile.common,v 1.32.4.1 2008/09/23 11:15:53 tron Exp $
+#
+# used by databases/mysql5-client/Makefile
+# used by databases/mysql5-server/Makefile
+#
 
-DISTNAME=		mysql-5.0.51b
+DISTNAME=		mysql-5.0.67
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -42,6 +46,8 @@ CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
 CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
 .endif
 
+BUILD_DEFS+=		VARBASE
+
 # 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".
diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk
index b6a028a5f1c..1daf7cecb0e 100644
--- a/databases/mysql5-client/buildlink3.mk
+++ b/databases/mysql5-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/06/30 12:01:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11.4.1 2008/09/23 11:15:53 tron Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client
 
 .if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=5.0.15
-BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=5.0.51b
+BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=5.0.67
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql5-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index ffcfeadb17f..c6a7e977b9e 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.23 2008/07/02 14:10:04 obache Exp $
+$NetBSD: distinfo,v 1.23.4.1 2008/09/23 11:15:53 tron Exp $
 
-SHA1 (mysql-5.0.51b.tar.gz) = 3884aed8e974fc397d1e86b0609a740a615dfd98
-RMD160 (mysql-5.0.51b.tar.gz) = 759682caa7708f400abd4ea980fe7ebb29cfe99a
-Size (mysql-5.0.51b.tar.gz) = 27809240 bytes
+SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377
+RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722
+Size (mysql-5.0.67.tar.gz) = 28370810 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
-SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
+SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
+SHA1 (patch-ac) = 7e7034f64f8337e459fe16611db8d7854c02931e
 SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
 SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da
-SHA1 (patch-af) = 06cb76ad50ed0de3e82f682bf57a75441f68da26
-SHA1 (patch-ag) = 212f9c0a2e2eb6feb013e4a72eaf658951b995b5
+SHA1 (patch-af) = b36307e554df858412c52ae53753c62d9761aaad
+SHA1 (patch-ag) = 076ab47225b66bc6d8472ec48f808641afdb780d
 SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
 SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76
-SHA1 (patch-aj) = 9961c99cc90bf5a0e5ef7a6313030128403a1f55
-SHA1 (patch-ak) = 76e361240f4e62e98cebcb25ef913de1aecddc1f
-SHA1 (patch-al) = 5189fee50cd16a620fb1ccb3fe529c26b5e72356
+SHA1 (patch-aj) = 1b831b1c7a616eba7d27f362a7c885ce6b853bbb
+SHA1 (patch-al) = b77d3ebb9602a33e11d22190f26ea93fd6fb533d
 SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e
 SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc
 SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88
diff --git a/databases/mysql5-client/patches/patch-ab b/databases/mysql5-client/patches/patch-ab
index 446170613e3..197caa96669 100644
--- a/databases/mysql5-client/patches/patch-ab
+++ b/databases/mysql5-client/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ab,v 1.2.14.1 2008/09/23 11:15:53 tron Exp $
 
---- sql/mysqld.cc.orig	2007-03-05 20:21:11.000000000 +0100
-+++ sql/mysqld.cc
-@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName
+--- sql/mysqld.cc.orig	2008-08-04 15:20:07.000000000 +0300
++++ sql/mysqld.cc	2008-09-16 12:16:20.000000000 +0300
+@@ -181,7 +181,7 @@
  int initgroups(const char *,unsigned int);
  #endif
  
diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
new file mode 100644
index 00000000000..2cb531af854
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.6.8.1 2008/09/23 11:15:53 tron Exp $
+
+--- configure.in.orig	2008-08-04 21:19:07.000000000 +0900
++++ configure.in
+@@ -2697,9 +2697,9 @@ linked_client_targets="linked_libmysql_s
+ 
+ if test "$THREAD_SAFE_CLIENT" = "no"
+ then
+-  sql_client_dirs="strings regex mysys dbug extra libmysql client"
++  sql_client_dirs="strings regex libmysql client"
+ else
+-  sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"
++  sql_client_dirs="strings regex libmysql libmysql_r client"
+   linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
+   AC_CONFIG_FILES(libmysql_r/Makefile)
+   AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index ba726f27c6e..5e254f85deb 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-af,v 1.6.14.1 2008/09/23 11:15:53 tron Exp $
 
---- man/Makefile.in.orig	2007-03-05 20:22:54.000000000 +0100
-+++ man/Makefile.in
-@@ -348,8 +348,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
+--- man/Makefile.in.orig	2008-08-04 15:22:07.000000000 +0300
++++ man/Makefile.in	2008-09-16 12:17:49.000000000 +0300
+@@ -354,8 +354,9 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
diff --git a/databases/mysql5-client/patches/patch-ag b/databases/mysql5-client/patches/patch-ag
index f2897508fbc..5b052df6e23 100644
--- a/databases/mysql5-client/patches/patch-ag
+++ b/databases/mysql5-client/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ag,v 1.3.14.1 2008/09/23 11:15:53 tron Exp $
 
---- strings/Makefile.in.orig	2007-03-05 20:23:22.000000000 +0100
-+++ strings/Makefile.in
-@@ -616,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+--- strings/Makefile.in.orig	2008-08-04 15:22:30.000000000 +0300
++++ strings/Makefile.in	2008-09-16 12:18:09.000000000 +0300
+@@ -622,7 +622,6 @@
  	  if test -f $$p; then \
  	    f=$(am__strip_dir) \
  	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
  	  else :; fi; \
  	done
  	@$(POST_INSTALL)
-@@ -624,7 +623,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+@@ -630,7 +629,6 @@
  	  if test -f $$p; then \
  	    p=$(am__strip_dir) \
  	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
@@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
  	  else :; fi; \
  	done
  
-@@ -633,7 +631,6 @@ uninstall-pkglibLIBRARIES:
+@@ -639,7 +637,6 @@
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
  	  p=$(am__strip_dir) \
  	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
diff --git a/databases/mysql5-client/patches/patch-aj b/databases/mysql5-client/patches/patch-aj
index 2c7bfd0df27..36df2035b8d 100644
--- a/databases/mysql5-client/patches/patch-aj
+++ b/databases/mysql5-client/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-aj,v 1.2.14.1 2008/09/23 11:15:53 tron Exp $
 
---- client/mysqladmin.cc.orig	2007-03-05 20:21:42.000000000 +0100
-+++ client/mysqladmin.cc
-@@ -325,8 +325,14 @@ int main(int argc,char *argv[])
+--- client/mysqladmin.cc.orig	2008-08-04 15:19:04.000000000 +0300
++++ client/mysqladmin.cc	2008-09-16 12:18:37.000000000 +0300
+@@ -331,8 +331,14 @@
    if (tty_password)
      opt_password = get_tty_password(NullS);
  
diff --git a/databases/mysql5-client/patches/patch-ak b/databases/mysql5-client/patches/patch-ak
deleted file mode 100644
index c2342d538b2..00000000000
--- a/databases/mysql5-client/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:28 adam Exp $
-
---- mysys/Makefile.in.orig	2007-03-05 20:22:57.000000000 +0100
-+++ mysys/Makefile.in
-@@ -428,7 +428,7 @@ MYSQLBASEdir = $(prefix)
- INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
- 			-I$(top_srcdir)/include -I$(srcdir)
- 
--pkglib_LIBRARIES = libmysys.a
-+pkglib_LIBRARIES =
- LDADD = libmysys.a ../dbug/libdbug.a \
- 			../strings/libmystrings.a
- 
diff --git a/databases/mysql5-client/patches/patch-al b/databases/mysql5-client/patches/patch-al
index 79e04eb77dc..89e249a9ddb 100644
--- a/databases/mysql5-client/patches/patch-al
+++ b/databases/mysql5-client/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-al,v 1.2.14.1 2008/09/23 11:15:53 tron Exp $
 
---- include/Makefile.in.orig	2007-03-11 09:24:33.000000000 +0100
-+++ include/Makefile.in
-@@ -360,6 +360,7 @@ zlib_dir = @zlib_dir@
+--- include/Makefile.in.orig	2008-08-04 15:22:05.000000000 +0300
++++ include/Makefile.in	2008-09-16 12:19:22.000000000 +0300
+@@ -366,6 +366,7 @@
  BUILT_SOURCES = $(HEADERS_GEN) abi_check
  HEADERS_GEN = mysql_version.h my_config.h
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 7736afe5097..6286edae1d7 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2008/07/01 09:22:59 tron Exp $
+# $NetBSD: Makefile,v 1.24.4.1 2008/09/23 11:15:53 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
+#PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 5, a free SQL database (server)
 
@@ -17,7 +17,7 @@ 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}
+CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER}
 
 PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
@@ -32,8 +32,8 @@ 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}
+			MYSQL_DATADIR=${MYSQL_DATADIR} \
+			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
 			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=		MYSQL_DATADIR
@@ -80,8 +80,8 @@ post-install:
 		${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	#${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+#	${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 \
+#		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
 		${DESTDIR}${PREFIX}/bin/mysql_secure_installation
 
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index bedb97bf634..30b0eb54003 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2007/12/14 13:36:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.12.8.1 2008/09/23 11:15:53 tron Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -40,12 +40,15 @@ 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/ctype_like_range_f1f2.inc
+share/mysql-test/include/ctype_regex.inc
 share/mysql-test/include/delete_anonymous_users.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
 share/mysql-test/include/get_binlog_dump_thread_id.inc
 share/mysql-test/include/gis_generic.inc
+share/mysql-test/include/gis_keys.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_big5.inc
@@ -67,6 +70,7 @@ 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_latin2_ch.inc
+share/mysql-test/include/have_local_infile.inc
 share/mysql-test/include/have_log_bin.inc
 share/mysql-test/include/have_lowercase0.inc
 share/mysql-test/include/have_lowercase1.inc
@@ -88,6 +92,7 @@ share/mysql-test/include/mysqltest-x.inc
 share/mysql-test/include/ndb_backup.inc
 share/mysql-test/include/ndb_backup_print.inc
 share/mysql-test/include/ndb_default_cluster.inc
+share/mysql-test/include/ndb_wait_connected.inc
 share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_openssl.inc
@@ -100,7 +105,9 @@ share/mysql-test/include/ps_query.inc
 share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/report-features.test
 share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/show_binary_logs.inc
 share/mysql-test/include/show_binlog_events.inc
+share/mysql-test/include/show_binlog_events2.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
 share/mysql-test/include/sp-vars.inc
@@ -110,6 +117,7 @@ share/mysql-test/include/test_outfile.inc
 share/mysql-test/include/testdb_only.inc
 share/mysql-test/include/uses_vardir.inc
 share/mysql-test/include/varchar.inc
+share/mysql-test/include/wait_condition.inc
 share/mysql-test/include/wait_for_query_to_suceed.inc
 share/mysql-test/include/wait_for_slave_io_to_stop.inc
 share/mysql-test/include/wait_for_slave_param.inc
@@ -139,6 +147,7 @@ share/mysql-test/mysql-test-run
 share/mysql-test/mysql-test-run-shell
 share/mysql-test/mysql-test-run.pl
 share/mysql-test/r/alias.result
+share/mysql-test/r/almost_full.result
 share/mysql-test/r/alter_table-big.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
@@ -162,8 +171,11 @@ share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
 share/mysql-test/r/binary.result
 share/mysql-test/r/binlog.result
+share/mysql-test/r/binlog_index.result
 share/mysql-test/r/binlog_innodb.result
 share/mysql-test/r/binlog_killed.result
+share/mysql-test/r/binlog_killed_simulate.result
+share/mysql-test/r/binlog_start_comment.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
 share/mysql-test/r/bootstrap.result
@@ -236,6 +248,7 @@ share/mysql-test/r/federated.result
 share/mysql-test/r/federated_archive.result
 share/mysql-test/r/federated_bug_13118.result
 share/mysql-test/r/federated_bug_25714.result
+share/mysql-test/r/federated_disabled.result
 share/mysql-test/r/federated_innodb.result
 share/mysql-test/r/fix_priv_tables.result
 share/mysql-test/r/flush.result
@@ -312,6 +325,7 @@ 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_latin2_ch.require
+share/mysql-test/r/have_local_infile.require
 share/mysql-test/r/have_log_bin.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
@@ -407,10 +421,13 @@ 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/multi_update_tiny_hash.result
 share/mysql-test/r/myisam-blob.result
 share/mysql-test/r/myisam.result
+share/mysql-test/r/myisampack.result
 share/mysql-test/r/mysql.result
 share/mysql-test/r/mysql_client_test.result
+share/mysql-test/r/mysql_comments.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysql_upgrade.result
 share/mysql-test/r/mysqladmin.result
@@ -420,11 +437,14 @@ share/mysql-test/r/mysqlbinlog2.result
 share/mysql-test/r/mysqlcheck.result
 share/mysql-test/r/mysqldump-compat.result
 share/mysql-test/r/mysqldump-max.result
+share/mysql-test/r/mysqldump-no-binlog.result
 share/mysql-test/r/mysqldump.result
 share/mysql-test/r/mysqlshow.result
 share/mysql-test/r/mysqltest.result
+share/mysql-test/r/named_pipe.result
 share/mysql-test/r/ndb_alter_table.result
 share/mysql-test/r/ndb_alter_table2.result
+share/mysql-test/r/ndb_auto_increment.result
 share/mysql-test/r/ndb_autodiscover.result
 share/mysql-test/r/ndb_autodiscover2.result
 share/mysql-test/r/ndb_autodiscover3.result
@@ -433,6 +453,7 @@ share/mysql-test/r/ndb_basic.result
 share/mysql-test/r/ndb_bitfield.result
 share/mysql-test/r/ndb_blob.result
 share/mysql-test/r/ndb_bug26793.result
+share/mysql-test/r/ndb_bug31477.result
 share/mysql-test/r/ndb_cache.result
 share/mysql-test/r/ndb_cache2.result
 share/mysql-test/r/ndb_cache_multi.result
@@ -481,8 +502,10 @@ 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/outfile_loaddata.result
 share/mysql-test/r/overflow.result
 share/mysql-test/r/packet.result
+share/mysql-test/r/parser.result
 share/mysql-test/r/parser_precedence.result
 share/mysql-test/r/perror.result
 share/mysql-test/r/preload.result
@@ -513,8 +536,12 @@ share/mysql-test/r/round.result
 share/mysql-test/r/row.result
 share/mysql-test/r/rowid_order_bdb.result
 share/mysql-test/r/rowid_order_innodb.result
+share/mysql-test/r/rpl000001.a.result
+share/mysql-test/r/rpl000001.b.result
 share/mysql-test/r/rpl000001.result
 share/mysql-test/r/rpl000002.result
+share/mysql-test/r/rpl000004.a.result
+share/mysql-test/r/rpl000004.b.result
 share/mysql-test/r/rpl000004.result
 share/mysql-test/r/rpl000005.result
 share/mysql-test/r/rpl000006.result
@@ -530,6 +557,8 @@ share/mysql-test/r/rpl_EE_error.result
 share/mysql-test/r/rpl_alter.result
 share/mysql-test/r/rpl_auto_increment.result
 share/mysql-test/r/rpl_auto_increment_11932.result
+share/mysql-test/r/rpl_auto_increment_bug33029.result
+share/mysql-test/r/rpl_bug33931.result
 share/mysql-test/r/rpl_change_master.result
 share/mysql-test/r/rpl_charset.result
 share/mysql-test/r/rpl_charset_sjis.result
@@ -543,6 +572,7 @@ 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_drop_view.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
@@ -564,6 +594,7 @@ share/mysql-test/r/rpl_insert_select.result
 share/mysql-test/r/rpl_known_bugs_detection.result
 share/mysql-test/r/rpl_loaddata.result
 share/mysql-test/r/rpl_loaddata_charset.result
+share/mysql-test/r/rpl_loaddata_map.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
@@ -594,11 +625,13 @@ 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_id.result
 share/mysql-test/r/rpl_server_id1.result
 share/mysql-test/r/rpl_server_id2.result
 share/mysql-test/r/rpl_session_var.result
 share/mysql-test/r/rpl_set_charset.result
 share/mysql-test/r/rpl_skip_error.result
+share/mysql-test/r/rpl_slave_skip.result
 share/mysql-test/r/rpl_slave_status.result
 share/mysql-test/r/rpl_sp.result
 share/mysql-test/r/rpl_sp_effects.result
@@ -607,9 +640,11 @@ share/mysql-test/r/rpl_ssl.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_transaction.result
 share/mysql-test/r/rpl_trigger.result
 share/mysql-test/r/rpl_trunc_temp.result
 share/mysql-test/r/rpl_until.result
+share/mysql-test/r/rpl_user.result
 share/mysql-test/r/rpl_user_variables.result
 share/mysql-test/r/rpl_variables.result
 share/mysql-test/r/rpl_view.result
@@ -619,6 +654,7 @@ share/mysql-test/r/select_found.result
 share/mysql-test/r/select_safe.result
 share/mysql-test/r/server_id.require
 share/mysql-test/r/server_id1.require
+share/mysql-test/r/shm.result
 share/mysql-test/r/show_check.result
 share/mysql-test/r/skip_grants.result
 share/mysql-test/r/skip_name_resolve.result
@@ -699,6 +735,7 @@ share/mysql-test/r/type_uint.result
 share/mysql-test/r/type_varchar.result
 share/mysql-test/r/type_year.result
 share/mysql-test/r/udf.result
+share/mysql-test/r/udf_skip_grants.result
 share/mysql-test/r/union.result
 share/mysql-test/r/update.result
 share/mysql-test/r/user_limits.result
@@ -712,7 +749,6 @@ share/mysql-test/r/view_grant.result
 share/mysql-test/r/wait_timeout.result
 share/mysql-test/r/warnings.result
 share/mysql-test/r/windows.result
-share/mysql-test/r/windows_shm.result
 share/mysql-test/r/xa.result
 share/mysql-test/std_data/14897.frm
 share/mysql-test/std_data/Index.xml
@@ -723,10 +759,31 @@ share/mysql-test/std_data/bug16266.000001
 share/mysql-test/std_data/bug19371.MYD
 share/mysql-test/std_data/bug19371.MYI
 share/mysql-test/std_data/bug19371.frm
+share/mysql-test/std_data/bug35469.dat
+share/mysql-test/std_data/bug36055.MYD
+share/mysql-test/std_data/bug36055.MYI
+share/mysql-test/std_data/bug36055.frm
 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/funcs_1/innodb_tb1.txt
+share/mysql-test/std_data/funcs_1/innodb_tb2.txt
+share/mysql-test/std_data/funcs_1/innodb_tb3.txt
+share/mysql-test/std_data/funcs_1/innodb_tb4.txt
+share/mysql-test/std_data/funcs_1/load_file.txt
+share/mysql-test/std_data/funcs_1/memory_tb1.txt
+share/mysql-test/std_data/funcs_1/memory_tb2.txt
+share/mysql-test/std_data/funcs_1/memory_tb3.txt
+share/mysql-test/std_data/funcs_1/memory_tb4.txt
+share/mysql-test/std_data/funcs_1/myisam_tb1.txt
+share/mysql-test/std_data/funcs_1/myisam_tb2.txt
+share/mysql-test/std_data/funcs_1/myisam_tb3.txt
+share/mysql-test/std_data/funcs_1/myisam_tb4.txt
+share/mysql-test/std_data/funcs_1/t3.txt
+share/mysql-test/std_data/funcs_1/t4.txt
+share/mysql-test/std_data/funcs_1/t7.txt
+share/mysql-test/std_data/funcs_1/t9.txt
 share/mysql-test/std_data/init_file.dat
 share/mysql-test/std_data/loaddata1.dat
 share/mysql-test/std_data/loaddata2.dat
@@ -768,38 +825,28 @@ share/mysql-test/std_data/words.dat
 share/mysql-test/suite/funcs_1/README.txt
 share/mysql-test/suite/funcs_1/bitdata/bitdata_master.test
 share/mysql-test/suite/funcs_1/cursors/cursors_master.test
-share/mysql-test/suite/funcs_1/data/innodb_tb1.txt
-share/mysql-test/suite/funcs_1/data/innodb_tb2.txt
-share/mysql-test/suite/funcs_1/data/innodb_tb3.txt
-share/mysql-test/suite/funcs_1/data/innodb_tb4.txt
-share/mysql-test/suite/funcs_1/data/memory_tb1.txt
-share/mysql-test/suite/funcs_1/data/memory_tb2.txt
-share/mysql-test/suite/funcs_1/data/memory_tb3.txt
-share/mysql-test/suite/funcs_1/data/memory_tb4.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb1.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb2.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb3.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb4.txt
-share/mysql-test/suite/funcs_1/data/t3.txt
-share/mysql-test/suite/funcs_1/data/t4.txt
-share/mysql-test/suite/funcs_1/data/t7.txt
-share/mysql-test/suite/funcs_1/data/t9.txt
+share/mysql-test/suite/funcs_1/datadict/basics_mixed1.inc
+share/mysql-test/suite/funcs_1/datadict/basics_mixed2.inc
+share/mysql-test/suite/funcs_1/datadict/basics_mixed3.inc
+share/mysql-test/suite/funcs_1/datadict/charset_collation.inc
+share/mysql-test/suite/funcs_1/datadict/columns.inc
+share/mysql-test/suite/funcs_1/datadict/datadict.pre
 share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
 share/mysql-test/suite/funcs_1/datadict/datadict_load.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_master.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
-share/mysql-test/suite/funcs_1/include/create_database.inc
-share/mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
-share/mysql-test/suite/funcs_1/include/create_user_no_super.inc
+share/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
+share/mysql-test/suite/funcs_1/datadict/is_routines.inc
+share/mysql-test/suite/funcs_1/datadict/is_schemata.inc
+share/mysql-test/suite/funcs_1/datadict/is_table_query.inc
+share/mysql-test/suite/funcs_1/datadict/is_tables.inc
+share/mysql-test/suite/funcs_1/datadict/is_triggers.inc
+share/mysql-test/suite/funcs_1/datadict/is_views.inc
+share/mysql-test/suite/funcs_1/datadict/statistics.inc
+share/mysql-test/suite/funcs_1/datadict/table_constraints.inc
+share/mysql-test/suite/funcs_1/datadict/tables.inc
+share/mysql-test/suite/funcs_1/datadict/tables1.inc
+share/mysql-test/suite/funcs_1/datadict/tables2.inc
+share/mysql-test/suite/funcs_1/include/bug28309_skip.inc
+share/mysql-test/suite/funcs_1/include/cleanup.inc
 share/mysql-test/suite/funcs_1/include/innodb_tb1.inc
 share/mysql-test/suite/funcs_1/include/innodb_tb2.inc
 share/mysql-test/suite/funcs_1/include/innodb_tb3.inc
@@ -814,12 +861,12 @@ share/mysql-test/suite/funcs_1/include/myisam_tb3.inc
 share/mysql-test/suite/funcs_1/include/myisam_tb4.inc
 share/mysql-test/suite/funcs_1/include/show_connection.inc
 share/mysql-test/suite/funcs_1/include/sp_tb.inc
+share/mysql-test/suite/funcs_1/include/tb3.inc
 share/mysql-test/suite/funcs_1/lib/DataGen_local.pl
 share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
-share/mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
-share/mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
-share/mysql-test/suite/funcs_1/r/innodb__datadict.result
-share/mysql-test/suite/funcs_1/r/innodb__load.result
+share/mysql-test/suite/funcs_1/r/charset_collation_1.result
+share/mysql-test/suite/funcs_1/r/charset_collation_2.result
+share/mysql-test/suite/funcs_1/r/charset_collation_3.result
 share/mysql-test/suite/funcs_1/r/innodb_bitdata.result
 share/mysql-test/suite/funcs_1/r/innodb_cursors.result
 share/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -837,10 +884,60 @@ share/mysql-test/suite/funcs_1/r/innodb_trig_08.result
 share/mysql-test/suite/funcs_1/r/innodb_trig_09.result
 share/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
 share/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
-share/mysql-test/suite/funcs_1/r/innodb_triggers.result
 share/mysql-test/suite/funcs_1/r/innodb_views.result
-share/mysql-test/suite/funcs_1/r/memory__datadict.result
-share/mysql-test/suite/funcs_1/r/memory__load.result
+share/mysql-test/suite/funcs_1/r/is_basics_mixed.result
+share/mysql-test/suite/funcs_1/r/is_character_sets.result
+share/mysql-test/suite/funcs_1/r/is_cml_innodb.result
+share/mysql-test/suite/funcs_1/r/is_cml_memory.result
+share/mysql-test/suite/funcs_1/r/is_cml_myisam.result
+share/mysql-test/suite/funcs_1/r/is_cml_ndb.result
+share/mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result
+share/mysql-test/suite/funcs_1/r/is_collations.result
+share/mysql-test/suite/funcs_1/r/is_column_privileges.result
+share/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result
+share/mysql-test/suite/funcs_1/r/is_columns.result
+share/mysql-test/suite/funcs_1/r/is_columns_innodb.result
+share/mysql-test/suite/funcs_1/r/is_columns_is.result
+share/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
+share/mysql-test/suite/funcs_1/r/is_columns_memory.result
+share/mysql-test/suite/funcs_1/r/is_columns_myisam.result
+share/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
+share/mysql-test/suite/funcs_1/r/is_columns_mysql.result
+share/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_columns_ndb.result
+share/mysql-test/suite/funcs_1/r/is_key_column_usage.result
+share/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
+share/mysql-test/suite/funcs_1/r/is_routines.result
+share/mysql-test/suite/funcs_1/r/is_routines_embedded.result
+share/mysql-test/suite/funcs_1/r/is_schema_privileges.result
+share/mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result
+share/mysql-test/suite/funcs_1/r/is_schemata.result
+share/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
+share/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result
+share/mysql-test/suite/funcs_1/r/is_statistics.result
+share/mysql-test/suite/funcs_1/r/is_statistics_is.result
+share/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
+share/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints_is.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_table_privileges.result
+share/mysql-test/suite/funcs_1/r/is_tables.result
+share/mysql-test/suite/funcs_1/r/is_tables_embedded.result
+share/mysql-test/suite/funcs_1/r/is_tables_innodb.result
+share/mysql-test/suite/funcs_1/r/is_tables_is.result
+share/mysql-test/suite/funcs_1/r/is_tables_memory.result
+share/mysql-test/suite/funcs_1/r/is_tables_myisam.result
+share/mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
+share/mysql-test/suite/funcs_1/r/is_tables_mysql.result
+share/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_tables_ndb.result
+share/mysql-test/suite/funcs_1/r/is_triggers.result
+share/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
+share/mysql-test/suite/funcs_1/r/is_user_privileges.result
+share/mysql-test/suite/funcs_1/r/is_views.result
+share/mysql-test/suite/funcs_1/r/is_views_embedded.result
 share/mysql-test/suite/funcs_1/r/memory_bitdata.result
 share/mysql-test/suite/funcs_1/r/memory_cursors.result
 share/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -857,10 +954,7 @@ share/mysql-test/suite/funcs_1/r/memory_trig_0407.result
 share/mysql-test/suite/funcs_1/r/memory_trig_08.result
 share/mysql-test/suite/funcs_1/r/memory_trig_09.result
 share/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
-share/mysql-test/suite/funcs_1/r/memory_triggers.result
 share/mysql-test/suite/funcs_1/r/memory_views.result
-share/mysql-test/suite/funcs_1/r/myisam__datadict.result
-share/mysql-test/suite/funcs_1/r/myisam__load.result
 share/mysql-test/suite/funcs_1/r/myisam_bitdata.result
 share/mysql-test/suite/funcs_1/r/myisam_cursors.result
 share/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -877,8 +971,13 @@ share/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_08.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_09.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
-share/mysql-test/suite/funcs_1/r/myisam_triggers.result
 share/mysql-test/suite/funcs_1/r/myisam_views.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_0102.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_03.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_0407.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_08.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_09.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
 share/mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
 share/mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
@@ -889,11 +988,10 @@ share/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
-share/mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
-share/mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
+share/mysql-test/suite/funcs_1/t/charset_collation_1.test
+share/mysql-test/suite/funcs_1/t/charset_collation_2.test
+share/mysql-test/suite/funcs_1/t/charset_collation_3.test
 share/mysql-test/suite/funcs_1/t/disabled.def
-share/mysql-test/suite/funcs_1/t/innodb__datadict.test
-share/mysql-test/suite/funcs_1/t/innodb__load.test
 share/mysql-test/suite/funcs_1/t/innodb_bitdata.test
 share/mysql-test/suite/funcs_1/t/innodb_cursors.test
 share/mysql-test/suite/funcs_1/t/innodb_func_view.test
@@ -912,8 +1010,59 @@ share/mysql-test/suite/funcs_1/t/innodb_trig_09.test
 share/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
 share/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
 share/mysql-test/suite/funcs_1/t/innodb_views.test
-share/mysql-test/suite/funcs_1/t/memory__datadict.test
-share/mysql-test/suite/funcs_1/t/memory__load.test
+share/mysql-test/suite/funcs_1/t/is_basics_mixed.test
+share/mysql-test/suite/funcs_1/t/is_character_sets.test
+share/mysql-test/suite/funcs_1/t/is_cml_innodb.test
+share/mysql-test/suite/funcs_1/t/is_cml_memory.test
+share/mysql-test/suite/funcs_1/t/is_cml_myisam.test
+share/mysql-test/suite/funcs_1/t/is_cml_ndb.test
+share/mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
+share/mysql-test/suite/funcs_1/t/is_collations.test
+share/mysql-test/suite/funcs_1/t/is_column_privileges.test
+share/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
+share/mysql-test/suite/funcs_1/t/is_columns.test
+share/mysql-test/suite/funcs_1/t/is_columns_innodb.test
+share/mysql-test/suite/funcs_1/t/is_columns_is.test
+share/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
+share/mysql-test/suite/funcs_1/t/is_columns_memory.test
+share/mysql-test/suite/funcs_1/t/is_columns_myisam.test
+share/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
+share/mysql-test/suite/funcs_1/t/is_columns_mysql.test
+share/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_columns_ndb.test
+share/mysql-test/suite/funcs_1/t/is_key_column_usage.test
+share/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
+share/mysql-test/suite/funcs_1/t/is_routines.test
+share/mysql-test/suite/funcs_1/t/is_routines_embedded.test
+share/mysql-test/suite/funcs_1/t/is_schema_privileges.test
+share/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
+share/mysql-test/suite/funcs_1/t/is_schemata.test
+share/mysql-test/suite/funcs_1/t/is_schemata_embedded.test
+share/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
+share/mysql-test/suite/funcs_1/t/is_statistics.test
+share/mysql-test/suite/funcs_1/t/is_statistics_is.test
+share/mysql-test/suite/funcs_1/t/is_statistics_mysql.test
+share/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints_is.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_table_privileges.test
+share/mysql-test/suite/funcs_1/t/is_tables.test
+share/mysql-test/suite/funcs_1/t/is_tables_embedded.test
+share/mysql-test/suite/funcs_1/t/is_tables_innodb.test
+share/mysql-test/suite/funcs_1/t/is_tables_is.test
+share/mysql-test/suite/funcs_1/t/is_tables_memory.test
+share/mysql-test/suite/funcs_1/t/is_tables_myisam.test
+share/mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test
+share/mysql-test/suite/funcs_1/t/is_tables_mysql.test
+share/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_tables_ndb.test
+share/mysql-test/suite/funcs_1/t/is_triggers.test
+share/mysql-test/suite/funcs_1/t/is_triggers_embedded.test
+share/mysql-test/suite/funcs_1/t/is_user_privileges.test
+share/mysql-test/suite/funcs_1/t/is_views.test
+share/mysql-test/suite/funcs_1/t/is_views_embedded.test
 share/mysql-test/suite/funcs_1/t/memory_bitdata.test
 share/mysql-test/suite/funcs_1/t/memory_cursors.test
 share/mysql-test/suite/funcs_1/t/memory_func_view.test
@@ -931,8 +1080,6 @@ share/mysql-test/suite/funcs_1/t/memory_trig_08.test
 share/mysql-test/suite/funcs_1/t/memory_trig_09.test
 share/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
 share/mysql-test/suite/funcs_1/t/memory_views.test
-share/mysql-test/suite/funcs_1/t/myisam__datadict.test
-share/mysql-test/suite/funcs_1/t/myisam__load.test
 share/mysql-test/suite/funcs_1/t/myisam_bitdata.test
 share/mysql-test/suite/funcs_1/t/myisam_cursors.test
 share/mysql-test/suite/funcs_1/t/myisam_func_view.test
@@ -950,6 +1097,12 @@ share/mysql-test/suite/funcs_1/t/myisam_trig_08.test
 share/mysql-test/suite/funcs_1/t/myisam_trig_09.test
 share/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
 share/mysql-test/suite/funcs_1/t/myisam_views.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_0102.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_03.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_0407.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_08.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_09.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
 share/mysql-test/suite/funcs_1/triggers/trig_frkey.inc
 share/mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
 share/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
@@ -958,7 +1111,6 @@ share/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
 share/mysql-test/suite/funcs_1/triggers/triggers_08.inc
 share/mysql-test/suite/funcs_1/triggers/triggers_09.inc
 share/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
-share/mysql-test/suite/funcs_1/triggers/triggers_master.test
 share/mysql-test/suite/funcs_1/views/func_view.inc
 share/mysql-test/suite/funcs_1/views/fv1.inc
 share/mysql-test/suite/funcs_1/views/fv2.inc
@@ -982,10 +1134,249 @@ share/mysql-test/suite/funcs_2/t/innodb_charset.test
 share/mysql-test/suite/funcs_2/t/memory_charset.test
 share/mysql-test/suite/funcs_2/t/myisam_charset.test
 share/mysql-test/suite/funcs_2/t/ndb_charset.test
+share/mysql-test/suite/jp/r/jp_alter_sjis.result
+share/mysql-test/suite/jp/r/jp_alter_ucs2.result
+share/mysql-test/suite/jp/r/jp_alter_ujis.result
+share/mysql-test/suite/jp/r/jp_alter_utf8.result
+share/mysql-test/suite/jp/r/jp_charlength_sjis.result
+share/mysql-test/suite/jp/r/jp_charlength_ucs2.result
+share/mysql-test/suite/jp/r/jp_charlength_ujis.result
+share/mysql-test/suite/jp/r/jp_charlength_utf8.result
+share/mysql-test/suite/jp/r/jp_charset_sjis.result
+share/mysql-test/suite/jp/r/jp_charset_ucs2.result
+share/mysql-test/suite/jp/r/jp_charset_ujis.result
+share/mysql-test/suite/jp/r/jp_charset_utf8.result
+share/mysql-test/suite/jp/r/jp_convert_sjis.result
+share/mysql-test/suite/jp/r/jp_convert_ucs2.result
+share/mysql-test/suite/jp/r/jp_convert_ujis.result
+share/mysql-test/suite/jp/r/jp_convert_utf8.result
+share/mysql-test/suite/jp/r/jp_create_db_sjis.result
+share/mysql-test/suite/jp/r/jp_create_db_ucs2.result
+share/mysql-test/suite/jp/r/jp_create_db_ujis.result
+share/mysql-test/suite/jp/r/jp_create_db_utf8.result
+share/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
+share/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
+share/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
+share/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
+share/mysql-test/suite/jp/r/jp_enum_sjis.result
+share/mysql-test/suite/jp/r/jp_enum_ucs2.result
+share/mysql-test/suite/jp/r/jp_enum_ujis.result
+share/mysql-test/suite/jp/r/jp_enum_utf8.result
+share/mysql-test/suite/jp/r/jp_insert_sjis.result
+share/mysql-test/suite/jp/r/jp_insert_ucs2.result
+share/mysql-test/suite/jp/r/jp_insert_ujis.result
+share/mysql-test/suite/jp/r/jp_insert_utf8.result
+share/mysql-test/suite/jp/r/jp_instr_sjis.result
+share/mysql-test/suite/jp/r/jp_instr_ucs2.result
+share/mysql-test/suite/jp/r/jp_instr_ujis.result
+share/mysql-test/suite/jp/r/jp_instr_utf8.result
+share/mysql-test/suite/jp/r/jp_join_sjis.result
+share/mysql-test/suite/jp/r/jp_join_ucs2.result
+share/mysql-test/suite/jp/r/jp_join_ujis.result
+share/mysql-test/suite/jp/r/jp_join_utf8.result
+share/mysql-test/suite/jp/r/jp_left_sjis.result
+share/mysql-test/suite/jp/r/jp_left_ucs2.result
+share/mysql-test/suite/jp/r/jp_left_ujis.result
+share/mysql-test/suite/jp/r/jp_left_utf8.result
+share/mysql-test/suite/jp/r/jp_length_sjis.result
+share/mysql-test/suite/jp/r/jp_length_ucs2.result
+share/mysql-test/suite/jp/r/jp_length_ujis.result
+share/mysql-test/suite/jp/r/jp_length_utf8.result
+share/mysql-test/suite/jp/r/jp_like_sjis.result
+share/mysql-test/suite/jp/r/jp_like_ucs2.result
+share/mysql-test/suite/jp/r/jp_like_ujis.result
+share/mysql-test/suite/jp/r/jp_like_utf8.result
+share/mysql-test/suite/jp/r/jp_locate_sjis.result
+share/mysql-test/suite/jp/r/jp_locate_ucs2.result
+share/mysql-test/suite/jp/r/jp_locate_ujis.result
+share/mysql-test/suite/jp/r/jp_locate_utf8.result
+share/mysql-test/suite/jp/r/jp_lpad_sjis.result
+share/mysql-test/suite/jp/r/jp_lpad_ucs2.result
+share/mysql-test/suite/jp/r/jp_lpad_ujis.result
+share/mysql-test/suite/jp/r/jp_lpad_utf8.result
+share/mysql-test/suite/jp/r/jp_ltrim_sjis.result
+share/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
+share/mysql-test/suite/jp/r/jp_ltrim_ujis.result
+share/mysql-test/suite/jp/r/jp_ltrim_utf8.result
+share/mysql-test/suite/jp/r/jp_ps_sjis.result
+share/mysql-test/suite/jp/r/jp_ps_ujis.result
+share/mysql-test/suite/jp/r/jp_replace_sjis.result
+share/mysql-test/suite/jp/r/jp_replace_ucs2.result
+share/mysql-test/suite/jp/r/jp_replace_ujis.result
+share/mysql-test/suite/jp/r/jp_replace_utf8.result
+share/mysql-test/suite/jp/r/jp_reverse_sjis.result
+share/mysql-test/suite/jp/r/jp_reverse_ucs2.result
+share/mysql-test/suite/jp/r/jp_reverse_ujis.result
+share/mysql-test/suite/jp/r/jp_reverse_utf8.result
+share/mysql-test/suite/jp/r/jp_right_sjis.result
+share/mysql-test/suite/jp/r/jp_right_ucs2.result
+share/mysql-test/suite/jp/r/jp_right_ujis.result
+share/mysql-test/suite/jp/r/jp_right_utf8.result
+share/mysql-test/suite/jp/r/jp_rpad_sjis.result
+share/mysql-test/suite/jp/r/jp_rpad_ucs2.result
+share/mysql-test/suite/jp/r/jp_rpad_ujis.result
+share/mysql-test/suite/jp/r/jp_rpad_utf8.result
+share/mysql-test/suite/jp/r/jp_rtrim_sjis.result
+share/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
+share/mysql-test/suite/jp/r/jp_rtrim_ujis.result
+share/mysql-test/suite/jp/r/jp_rtrim_utf8.result
+share/mysql-test/suite/jp/r/jp_select_sjis.result
+share/mysql-test/suite/jp/r/jp_select_ucs2.result
+share/mysql-test/suite/jp/r/jp_select_ujis.result
+share/mysql-test/suite/jp/r/jp_select_utf8.result
+share/mysql-test/suite/jp/r/jp_subquery_sjis.result
+share/mysql-test/suite/jp/r/jp_subquery_ucs2.result
+share/mysql-test/suite/jp/r/jp_subquery_ujis.result
+share/mysql-test/suite/jp/r/jp_subquery_utf8.result
+share/mysql-test/suite/jp/r/jp_substring_sjis.result
+share/mysql-test/suite/jp/r/jp_substring_ucs2.result
+share/mysql-test/suite/jp/r/jp_substring_ujis.result
+share/mysql-test/suite/jp/r/jp_substring_utf8.result
+share/mysql-test/suite/jp/r/jp_trim_sjis.result
+share/mysql-test/suite/jp/r/jp_trim_ucs2.result
+share/mysql-test/suite/jp/r/jp_trim_ujis.result
+share/mysql-test/suite/jp/r/jp_trim_utf8.result
+share/mysql-test/suite/jp/r/jp_union_ujis.result
+share/mysql-test/suite/jp/r/jp_update_sjis.result
+share/mysql-test/suite/jp/r/jp_update_ucs2.result
+share/mysql-test/suite/jp/r/jp_update_ujis.result
+share/mysql-test/suite/jp/r/jp_update_utf8.result
+share/mysql-test/suite/jp/r/jp_where_sjis.result
+share/mysql-test/suite/jp/r/jp_where_ucs2.result
+share/mysql-test/suite/jp/r/jp_where_ujis.result
+share/mysql-test/suite/jp/r/jp_where_utf8.result
+share/mysql-test/suite/jp/std_data/jisx0201_sjis.dat
+share/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat
+share/mysql-test/suite/jp/std_data/jisx0201_ujis.dat
+share/mysql-test/suite/jp/std_data/jisx0201_utf8.dat
+share/mysql-test/suite/jp/std_data/jisx0208_sjis.dat
+share/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
+share/mysql-test/suite/jp/std_data/jisx0208_sjis3.dat
+share/mysql-test/suite/jp/std_data/jisx0208_ucs2.dat
+share/mysql-test/suite/jp/std_data/jisx0208_ujis.dat
+share/mysql-test/suite/jp/std_data/jisx0208_utf8.dat
+share/mysql-test/suite/jp/std_data/jisx0212_ucs2.dat
+share/mysql-test/suite/jp/std_data/jisx0212_ujis.dat
+share/mysql-test/suite/jp/std_data/jisx0212_utf8.dat
+share/mysql-test/suite/jp/t/jp_alter_sjis.test
+share/mysql-test/suite/jp/t/jp_alter_ucs2.test
+share/mysql-test/suite/jp/t/jp_alter_ujis.test
+share/mysql-test/suite/jp/t/jp_alter_utf8.test
+share/mysql-test/suite/jp/t/jp_charlength_sjis.test
+share/mysql-test/suite/jp/t/jp_charlength_ucs2.test
+share/mysql-test/suite/jp/t/jp_charlength_ujis.test
+share/mysql-test/suite/jp/t/jp_charlength_utf8.test
+share/mysql-test/suite/jp/t/jp_charset_sjis.test
+share/mysql-test/suite/jp/t/jp_charset_ucs2.test
+share/mysql-test/suite/jp/t/jp_charset_ujis.test
+share/mysql-test/suite/jp/t/jp_charset_utf8.test
+share/mysql-test/suite/jp/t/jp_convert_sjis.test
+share/mysql-test/suite/jp/t/jp_convert_ucs2.test
+share/mysql-test/suite/jp/t/jp_convert_ujis.test
+share/mysql-test/suite/jp/t/jp_convert_utf8.test
+share/mysql-test/suite/jp/t/jp_create_db_sjis.test
+share/mysql-test/suite/jp/t/jp_create_db_ucs2.test
+share/mysql-test/suite/jp/t/jp_create_db_ujis.test
+share/mysql-test/suite/jp/t/jp_create_db_utf8.test
+share/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
+share/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
+share/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
+share/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
+share/mysql-test/suite/jp/t/jp_enum_sjis.test
+share/mysql-test/suite/jp/t/jp_enum_ucs2.test
+share/mysql-test/suite/jp/t/jp_enum_ujis.test
+share/mysql-test/suite/jp/t/jp_enum_utf8.test
+share/mysql-test/suite/jp/t/jp_insert_sjis.test
+share/mysql-test/suite/jp/t/jp_insert_ucs2.test
+share/mysql-test/suite/jp/t/jp_insert_ujis.test
+share/mysql-test/suite/jp/t/jp_insert_utf8.test
+share/mysql-test/suite/jp/t/jp_instr_sjis.test
+share/mysql-test/suite/jp/t/jp_instr_ucs2.test
+share/mysql-test/suite/jp/t/jp_instr_ujis.test
+share/mysql-test/suite/jp/t/jp_instr_utf8.test
+share/mysql-test/suite/jp/t/jp_join_sjis.test
+share/mysql-test/suite/jp/t/jp_join_ucs2.test
+share/mysql-test/suite/jp/t/jp_join_ujis.test
+share/mysql-test/suite/jp/t/jp_join_utf8.test
+share/mysql-test/suite/jp/t/jp_left_sjis.test
+share/mysql-test/suite/jp/t/jp_left_ucs2.test
+share/mysql-test/suite/jp/t/jp_left_ujis.test
+share/mysql-test/suite/jp/t/jp_left_utf8.test
+share/mysql-test/suite/jp/t/jp_length_sjis.test
+share/mysql-test/suite/jp/t/jp_length_ucs2.test
+share/mysql-test/suite/jp/t/jp_length_ujis.test
+share/mysql-test/suite/jp/t/jp_length_utf8.test
+share/mysql-test/suite/jp/t/jp_like_sjis.test
+share/mysql-test/suite/jp/t/jp_like_ucs2.test
+share/mysql-test/suite/jp/t/jp_like_ujis.test
+share/mysql-test/suite/jp/t/jp_like_utf8.test
+share/mysql-test/suite/jp/t/jp_locate_sjis.test
+share/mysql-test/suite/jp/t/jp_locate_ucs2.test
+share/mysql-test/suite/jp/t/jp_locate_ujis.test
+share/mysql-test/suite/jp/t/jp_locate_utf8.test
+share/mysql-test/suite/jp/t/jp_lpad_sjis.test
+share/mysql-test/suite/jp/t/jp_lpad_ucs2.test
+share/mysql-test/suite/jp/t/jp_lpad_ujis.test
+share/mysql-test/suite/jp/t/jp_lpad_utf8.test
+share/mysql-test/suite/jp/t/jp_ltrim_sjis.test
+share/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
+share/mysql-test/suite/jp/t/jp_ltrim_ujis.test
+share/mysql-test/suite/jp/t/jp_ltrim_utf8.test
+share/mysql-test/suite/jp/t/jp_ps_sjis.test
+share/mysql-test/suite/jp/t/jp_ps_ujis.test
+share/mysql-test/suite/jp/t/jp_replace_sjis.test
+share/mysql-test/suite/jp/t/jp_replace_ucs2.test
+share/mysql-test/suite/jp/t/jp_replace_ujis.test
+share/mysql-test/suite/jp/t/jp_replace_utf8.test
+share/mysql-test/suite/jp/t/jp_reverse_sjis.test
+share/mysql-test/suite/jp/t/jp_reverse_ucs2.test
+share/mysql-test/suite/jp/t/jp_reverse_ujis.test
+share/mysql-test/suite/jp/t/jp_reverse_utf8.test
+share/mysql-test/suite/jp/t/jp_right_sjis.test
+share/mysql-test/suite/jp/t/jp_right_ucs2.test
+share/mysql-test/suite/jp/t/jp_right_ujis.test
+share/mysql-test/suite/jp/t/jp_right_utf8.test
+share/mysql-test/suite/jp/t/jp_rpad_sjis.test
+share/mysql-test/suite/jp/t/jp_rpad_ucs2.test
+share/mysql-test/suite/jp/t/jp_rpad_ujis.test
+share/mysql-test/suite/jp/t/jp_rpad_utf8.test
+share/mysql-test/suite/jp/t/jp_rtrim_sjis.test
+share/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
+share/mysql-test/suite/jp/t/jp_rtrim_ujis.test
+share/mysql-test/suite/jp/t/jp_rtrim_utf8.test
+share/mysql-test/suite/jp/t/jp_select_sjis.test
+share/mysql-test/suite/jp/t/jp_select_ucs2.test
+share/mysql-test/suite/jp/t/jp_select_ujis.test
+share/mysql-test/suite/jp/t/jp_select_utf8.test
+share/mysql-test/suite/jp/t/jp_subquery_sjis.test
+share/mysql-test/suite/jp/t/jp_subquery_ucs2.test
+share/mysql-test/suite/jp/t/jp_subquery_ujis.test
+share/mysql-test/suite/jp/t/jp_subquery_utf8.test
+share/mysql-test/suite/jp/t/jp_substring_sjis.test
+share/mysql-test/suite/jp/t/jp_substring_ucs2.test
+share/mysql-test/suite/jp/t/jp_substring_ujis.test
+share/mysql-test/suite/jp/t/jp_substring_utf8.test
+share/mysql-test/suite/jp/t/jp_trim_sjis.test
+share/mysql-test/suite/jp/t/jp_trim_ucs2.test
+share/mysql-test/suite/jp/t/jp_trim_ujis.test
+share/mysql-test/suite/jp/t/jp_trim_utf8.test
+share/mysql-test/suite/jp/t/jp_union_ujis.test
+share/mysql-test/suite/jp/t/jp_update_sjis.test
+share/mysql-test/suite/jp/t/jp_update_ucs2.test
+share/mysql-test/suite/jp/t/jp_update_ujis.test
+share/mysql-test/suite/jp/t/jp_update_utf8.test
+share/mysql-test/suite/jp/t/jp_where_sjis.test
+share/mysql-test/suite/jp/t/jp_where_ucs2.test
+share/mysql-test/suite/jp/t/jp_where_ujis.test
+share/mysql-test/suite/jp/t/jp_where_utf8.test
 share/mysql-test/suite/large_tests/README.TXT
 share/mysql-test/suite/large_tests/r/alter_table.result
 share/mysql-test/suite/large_tests/t/alter_table.test
+share/mysql-test/suite/manual/r/rpl_replication_delay.result
+share/mysql-test/suite/manual/t/rpl_replication_delay-slave.opt
+share/mysql-test/suite/manual/t/rpl_replication_delay.test
 share/mysql-test/t/alias.test
+share/mysql-test/t/almost_full.test
 share/mysql-test/t/alter_table-big.test
 share/mysql-test/t/alter_table.test
 share/mysql-test/t/analyse.test
@@ -1012,8 +1403,12 @@ share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
 share/mysql-test/t/binlog-master.opt
 share/mysql-test/t/binlog.test
+share/mysql-test/t/binlog_index.test
 share/mysql-test/t/binlog_innodb.test
 share/mysql-test/t/binlog_killed.test
+share/mysql-test/t/binlog_killed_simulate-master.opt
+share/mysql-test/t/binlog_killed_simulate.test
+share/mysql-test/t/binlog_start_comment.test
 share/mysql-test/t/blackhole.test
 share/mysql-test/t/bool.test
 share/mysql-test/t/bootstrap.test
@@ -1091,6 +1486,8 @@ share/mysql-test/t/federated.test
 share/mysql-test/t/federated_archive.test
 share/mysql-test/t/federated_bug_13118.test
 share/mysql-test/t/federated_bug_25714.test
+share/mysql-test/t/federated_disabled-master.opt
+share/mysql-test/t/federated_disabled.test
 share/mysql-test/t/federated_innodb-slave.opt
 share/mysql-test/t/federated_innodb.test
 share/mysql-test/t/fix_priv_tables.test
@@ -1250,12 +1647,17 @@ 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/multi_update_tiny_hash-master.opt
+share/mysql-test/t/multi_update_tiny_hash.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/myisampack.test
 share/mysql-test/t/mysql.test
 share/mysql-test/t/mysql_client_test.opt
 share/mysql-test/t/mysql_client_test.test
+share/mysql-test/t/mysql_comments.sql
+share/mysql-test/t/mysql_comments.test
 share/mysql-test/t/mysql_delimiter.sql
 share/mysql-test/t/mysql_delimiter_19799.sql
 share/mysql-test/t/mysql_delimiter_source.sql
@@ -1271,11 +1673,16 @@ share/mysql-test/t/mysqlcheck.test
 share/mysql-test/t/mysqldump-compat.opt
 share/mysql-test/t/mysqldump-compat.test
 share/mysql-test/t/mysqldump-max.test
+share/mysql-test/t/mysqldump-no-binlog-master.opt
+share/mysql-test/t/mysqldump-no-binlog.test
 share/mysql-test/t/mysqldump.test
 share/mysql-test/t/mysqlshow.test
 share/mysql-test/t/mysqltest.test
+share/mysql-test/t/named_pipe-master.opt
+share/mysql-test/t/named_pipe.test
 share/mysql-test/t/ndb_alter_table.test
 share/mysql-test/t/ndb_alter_table2.test
+share/mysql-test/t/ndb_auto_increment.test
 share/mysql-test/t/ndb_autodiscover.test
 share/mysql-test/t/ndb_autodiscover2-master.opt
 share/mysql-test/t/ndb_autodiscover2.test
@@ -1285,6 +1692,7 @@ share/mysql-test/t/ndb_basic.test
 share/mysql-test/t/ndb_bitfield.test
 share/mysql-test/t/ndb_blob.test
 share/mysql-test/t/ndb_bug26793.test
+share/mysql-test/t/ndb_bug31477.test
 share/mysql-test/t/ndb_cache.test
 share/mysql-test/t/ndb_cache2.test
 share/mysql-test/t/ndb_cache_multi.test
@@ -1329,8 +1737,10 @@ 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/outfile_loaddata.test
 share/mysql-test/t/overflow.test
 share/mysql-test/t/packet.test
+share/mysql-test/t/parser.test
 share/mysql-test/t/parser_precedence.test
 share/mysql-test/t/perror.test
 share/mysql-test/t/preload.test
@@ -1391,6 +1801,9 @@ share/mysql-test/t/rpl_alter.test
 share/mysql-test/t/rpl_auto_increment-master.opt
 share/mysql-test/t/rpl_auto_increment.test
 share/mysql-test/t/rpl_auto_increment_11932.test
+share/mysql-test/t/rpl_auto_increment_bug33029.test
+share/mysql-test/t/rpl_bug33931-slave.opt
+share/mysql-test/t/rpl_bug33931.test
 share/mysql-test/t/rpl_change_master.test
 share/mysql-test/t/rpl_charset.test
 share/mysql-test/t/rpl_charset_sjis.test
@@ -1408,7 +1821,9 @@ 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_drop_view.test
 share/mysql-test/t/rpl_dual_pos_advance-master.opt
+share/mysql-test/t/rpl_dual_pos_advance-slave.opt
 share/mysql-test/t/rpl_dual_pos_advance.test
 share/mysql-test/t/rpl_empty_master_crash-master.opt
 share/mysql-test/t/rpl_empty_master_crash.test
@@ -1445,6 +1860,9 @@ share/mysql-test/t/rpl_known_bugs_detection-master.opt
 share/mysql-test/t/rpl_known_bugs_detection.test
 share/mysql-test/t/rpl_loaddata.test
 share/mysql-test/t/rpl_loaddata_charset.test
+share/mysql-test/t/rpl_loaddata_map-master.opt
+share/mysql-test/t/rpl_loaddata_map-slave.opt
+share/mysql-test/t/rpl_loaddata_map.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
@@ -1494,6 +1912,7 @@ 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_id.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
@@ -1501,6 +1920,8 @@ share/mysql-test/t/rpl_session_var.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_skip-slave.opt
+share/mysql-test/t/rpl_slave_skip.test
 share/mysql-test/t/rpl_slave_status.test
 share/mysql-test/t/rpl_sp-master.opt
 share/mysql-test/t/rpl_sp-slave.opt
@@ -1516,9 +1937,13 @@ 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_transaction-master.opt
+share/mysql-test/t/rpl_transaction-slave.opt
+share/mysql-test/t/rpl_transaction.test
 share/mysql-test/t/rpl_trigger.test
 share/mysql-test/t/rpl_trunc_temp.test
 share/mysql-test/t/rpl_until.test
+share/mysql-test/t/rpl_user.test
 share/mysql-test/t/rpl_user_variables.test
 share/mysql-test/t/rpl_variables-master.opt
 share/mysql-test/t/rpl_variables.test
@@ -1528,6 +1953,8 @@ share/mysql-test/t/schema.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/shm-master.opt
+share/mysql-test/t/shm.test
 share/mysql-test/t/show_check-master.opt
 share/mysql-test/t/show_check.test
 share/mysql-test/t/skip_grants-master.opt
@@ -1616,6 +2043,8 @@ share/mysql-test/t/type_uint.test
 share/mysql-test/t/type_varchar.test
 share/mysql-test/t/type_year.test
 share/mysql-test/t/udf.test
+share/mysql-test/t/udf_skip_grants-master.opt
+share/mysql-test/t/udf_skip_grants.test
 share/mysql-test/t/union-master.opt
 share/mysql-test/t/union.test
 share/mysql-test/t/update.test
@@ -1635,8 +2064,6 @@ 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-test/t/windows_shm-master.opt
-share/mysql-test/t/windows_shm.test
 share/mysql-test/t/xa.test
 share/mysql/charsets/Index.xml
 share/mysql/charsets/README
@@ -1720,6 +2147,13 @@ share/mysql/ukrainian/errmsg.sys
 @dirrm share/mysql-test/suite/large_tests/t
 @dirrm share/mysql-test/suite/large_tests/r
 @dirrm share/mysql-test/suite/large_tests
+@dirrm share/mysql-test/suite/manual/t
+@dirrm share/mysql-test/suite/manual/r
+@dirrm share/mysql-test/suite/manual
+@dirrm share/mysql-test/suite/jp/t
+@dirrm share/mysql-test/suite/jp/std_data
+@dirrm share/mysql-test/suite/jp/r
+@dirrm share/mysql-test/suite/jp
 @dirrm share/mysql-test/suite/funcs_2/t
 @dirrm share/mysql-test/suite/funcs_2/r
 @dirrm share/mysql-test/suite/funcs_2/lib
@@ -1735,13 +2169,13 @@ share/mysql/ukrainian/errmsg.sys
 @dirrm share/mysql-test/suite/funcs_1/lib
 @dirrm share/mysql-test/suite/funcs_1/include
 @dirrm share/mysql-test/suite/funcs_1/datadict
-@dirrm share/mysql-test/suite/funcs_1/data
 @dirrm share/mysql-test/suite/funcs_1/cursors
 @dirrm share/mysql-test/suite/funcs_1/bitdata
 @dirrm share/mysql-test/suite/funcs_1
 @dirrm share/mysql-test/suite
 @dirrm share/mysql-test/std_data/ndb_backup50_data_le
 @dirrm share/mysql-test/std_data/ndb_backup50_data_be
+@dirrm share/mysql-test/std_data/funcs_1
 @dirrm share/mysql-test/std_data
 @dirrm share/mysql-test/r
 @dirrm share/mysql-test/lib
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 16d2eb3becc..919ff5eab43 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,24 +1,22 @@
-$NetBSD: distinfo,v 1.20 2008/07/01 09:22:59 tron Exp $
+$NetBSD: distinfo,v 1.20.4.1 2008/09/23 11:15:53 tron Exp $
 
-SHA1 (mysql-5.0.51b.tar.gz) = 3884aed8e974fc397d1e86b0609a740a615dfd98
-RMD160 (mysql-5.0.51b.tar.gz) = 759682caa7708f400abd4ea980fe7ebb29cfe99a
-Size (mysql-5.0.51b.tar.gz) = 27809240 bytes
+SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377
+RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722
+Size (mysql-5.0.67.tar.gz) = 28370810 bytes
 SHA1 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023
 SHA1 (patch-ab) = 7d3ff56e929f93b4843d62014a3f5f37cc1e84bc
-SHA1 (patch-ad) = 85772311f995590e5202ca80068fee5274128145
+SHA1 (patch-ad) = b3246e3b2a666dffb72830c3ca30050a1e1263ca
 SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
 SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
-SHA1 (patch-ag) = 7c12975196f504c76954bfe92ffff0a98ba63019
+SHA1 (patch-ag) = 6412da46f0d891b64d90c2e3f9b79a1ec442d617
 SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597
-SHA1 (patch-ai) = c8ba7dfe00f37682e3f521314fe4225aa0b8e4a3
+SHA1 (patch-ai) = 56d3f66a903224b8d27213480e7ea3e485e52f1d
 SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
 SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea
 SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1
 SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
-SHA1 (patch-an) = b657862771fbc4f6ba748e5b02e4eae51fa87ac1
+SHA1 (patch-an) = 4017b68e0b67c07810f756a2bfbc138ede5c954d
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
-SHA1 (patch-ca) = 1548b047c0767bb0f32e3960218150fbc6c739b5
-SHA1 (patch-cb) = 282ba93d296927236eaff690201e0139cdc8fbcb
-SHA1 (patch-cc) = ae90cc9787b9f29fcba6a1222e2973f296893bd4
-SHA1 (patch-da) = 7da363a87b84f0c2feb3f5f141a54f22a2b6749a
-SHA1 (patch-db) = 6b9a94bd0ba6667a954bd2459b870e63ec72ecd0
+SHA1 (patch-ca) = 97fe10dc40c5995b174f8e07dc5e22a72b9913f4
+SHA1 (patch-cb) = f7dbc53f2405bf8a38c3d307dc68560a1b79ed01
+SHA1 (patch-cc) = 0f4bc2bc83291c42381e39339e9b6507b7fd151a
diff --git a/databases/mysql5-server/patches/patch-ad b/databases/mysql5-server/patches/patch-ad
index 597f554facb..974f0eb070e 100644
--- a/databases/mysql5-server/patches/patch-ad
+++ b/databases/mysql5-server/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2008/07/01 09:22:59 tron Exp $
+$NetBSD: patch-ad,v 1.3.4.1 2008/09/23 11:15:53 tron Exp $
 
---- sql/mysqld.cc.orig	2007-11-15 14:06:16.000000000 +0000
-+++ sql/mysqld.cc	2008-06-30 15:54:35.000000000 +0100
-@@ -174,7 +174,7 @@
+--- sql/mysqld.cc.orig	2008-08-04 15:20:07.000000000 +0300
++++ sql/mysqld.cc	2008-09-16 13:46:29.000000000 +0300
+@@ -181,7 +181,7 @@
  int initgroups(const char *,unsigned int);
  #endif
  
@@ -11,15 +11,7 @@ $NetBSD: patch-ad,v 1.3 2008/07/01 09:22:59 tron Exp $
  #include <ieeefp.h>
  #ifdef HAVE_FP_EXCEPT				// Fix type conflict
  typedef fp_except fp_except_t;
-@@ -323,6 +323,7 @@
- static char *default_collation_name;
- static char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME;
- static char mysql_data_home_buff[2];
-+char mysql_unpacked_real_data_home[FN_REFLEN];
- static I_List<THD> thread_cache;
- 
- #ifndef EMBEDDED_LIBRARY
-@@ -3543,7 +3544,7 @@
+@@ -3705,7 +3705,7 @@
    init_ssl();
  
  #ifdef HAVE_LIBWRAP
@@ -28,13 +20,3 @@ $NetBSD: patch-ad,v 1.3 2008/07/01 09:22:59 tron Exp $
    openlog(libwrapName, LOG_PID, LOG_AUTH);
  #endif
  
-@@ -7565,6 +7566,9 @@
-     pos[1]= 0;
-   }
-   convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS);
-+  (void) fn_format(buff, mysql_real_data_home, "", "",
-+                   (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS));
-+  (void) unpack_dirname(mysql_unpacked_real_data_home, buff);
-   convert_dirname(language,language,NullS);
-   (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir
-   (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home);
diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
index 30404561ceb..dd6803a24ae 100644
--- a/databases/mysql5-server/patches/patch-ag
+++ b/databases/mysql5-server/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2007/03/11 18:42:49 adam Exp $
+$NetBSD: patch-ag,v 1.6.14.1 2008/09/23 11:15:53 tron Exp $
 
---- man/Makefile.in.orig	2007-03-05 20:22:54.000000000 +0100
-+++ man/Makefile.in
-@@ -348,7 +348,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
+--- man/Makefile.in.orig	2008-08-04 15:22:07.000000000 +0300
++++ man/Makefile.in	2008-09-16 13:48:02.000000000 +0300
+@@ -354,7 +354,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
diff --git a/databases/mysql5-server/patches/patch-ai b/databases/mysql5-server/patches/patch-ai
index 1ee4fd0978e..cad3d4ca504 100644
--- a/databases/mysql5-server/patches/patch-ai
+++ b/databases/mysql5-server/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2007/03/11 18:42:49 adam Exp $
+$NetBSD: patch-ai,v 1.2.14.1 2008/09/23 11:15:53 tron Exp $
 
---- include/my_pthread.h.orig	2007-03-05 20:21:12.000000000 +0100
-+++ include/my_pthread.h
+--- include/my_pthread.h.orig	2008-08-04 15:19:12.000000000 +0300
++++ include/my_pthread.h	2008-09-16 13:48:57.000000000 +0300
 @@ -18,7 +18,13 @@
  #ifndef _my_pthread_h
  #define _my_pthread_h
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.2 2007/03/11 18:42:49 adam Exp $
  #ifndef ETIME
  #define ETIME ETIMEDOUT				/* For FreeBSD */
  #endif
-@@ -338,7 +344,11 @@ int sigwait(sigset_t *set, int *sig);
+@@ -326,7 +332,11 @@
  #endif
  
  #ifndef HAVE_NONPOSIX_SIGWAIT
diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an
index ba061818df4..f64d24b5695 100644
--- a/databases/mysql5-server/patches/patch-an
+++ b/databases/mysql5-server/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.4 2007/12/14 13:36:54 tron Exp $
+$NetBSD: patch-an,v 1.4.8.1 2008/09/23 11:15:53 tron Exp $
 
---- mysql-test/Makefile.in.orig	2007-11-15 14:08:22.000000000 +0000
-+++ mysql-test/Makefile.in	2007-12-14 00:01:23.000000000 +0000
-@@ -367,7 +367,7 @@
+--- mysql-test/Makefile.in.orig	2008-08-04 15:22:09.000000000 +0300
++++ mysql-test/Makefile.in	2008-09-16 13:52:20.000000000 +0300
+@@ -371,7 +371,7 @@
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
  benchdir_root = $(prefix)
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.4 2007/12/14 13:36:54 tron Exp $
  EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
  EXTRA_DIST = $(EXTRA_SCRIPTS) suite
  GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr
-@@ -743,14 +743,13 @@
+@@ -749,15 +749,14 @@
  	-rm -rf `find $(distdir)/suite -type d -name SCCS`
  
  install-data-local:
@@ -22,14 +22,16 @@ $NetBSD: patch-an,v 1.4 2007/12/14 13:36:54 tron Exp $
 -		$(DESTDIR)$(testdir)/std_data \
 -		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
 -		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
--		$(DESTDIR)$(testdir)/lib
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/t \
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/r \
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/include \
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data \
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
+-		$(DESTDIR)$(testdir)/lib \
+-		$(DESTDIR)$(testdir)/std_data/funcs_1
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/t
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/r
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/include
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le
 +	$(mkinstalldirs) $(DESTDIR)$(testdir)/lib
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data/funcs_1
  	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
  	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
  	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
diff --git a/databases/mysql5-server/patches/patch-ca b/databases/mysql5-server/patches/patch-ca
index 10b8178ccb7..a93dc323295 100644
--- a/databases/mysql5-server/patches/patch-ca
+++ b/databases/mysql5-server/patches/patch-ca
@@ -1,12 +1,12 @@
-$NetBSD: patch-ca,v 1.1 2008/01/22 00:41:59 rillig Exp $
+$NetBSD: patch-ca,v 1.1.6.1 2008/09/23 11:15:53 tron Exp $
 
 Before calling sigsend(), make sure the function actuall exists. Fixes
 the build on NetBSD >= 4.99.49, in which the macro P_MYID is defined
 somewhere unrelated to signals.
 
---- configure.in.orig	2007-11-15 15:06:32.000000000 +0100
-+++ configure.in	2008-01-22 01:11:07.000000000 +0100
-@@ -1955,7 +1955,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire
+--- configure.in.orig	2008-08-04 15:19:07.000000000 +0300
++++ configure.in	2008-09-16 13:52:59.000000000 +0300
+@@ -2001,7 +2001,7 @@
  paths.h semaphore.h)
  
  # Already-done: strcasecmp
diff --git a/databases/mysql5-server/patches/patch-cb b/databases/mysql5-server/patches/patch-cb
index 52aab1edc87..8223816033d 100644
--- a/databases/mysql5-server/patches/patch-cb
+++ b/databases/mysql5-server/patches/patch-cb
@@ -1,10 +1,10 @@
-$NetBSD: patch-cb,v 1.1 2008/01/22 00:42:00 rillig Exp $
+$NetBSD: patch-cb,v 1.1.6.1 2008/09/23 11:15:53 tron Exp $
 
 See patch-ca.
 
---- libmysqld/stacktrace.c.orig	2007-11-15 15:06:35.000000000 +0100
-+++ libmysqld/stacktrace.c	2008-01-22 01:16:41.000000000 +0100
-@@ -251,7 +251,7 @@ void write_core(int sig)
+--- libmysqld/stacktrace.c.orig	2008-08-04 15:20:12.000000000 +0300
++++ libmysqld/stacktrace.c	2008-09-16 13:53:23.000000000 +0300
+@@ -252,7 +252,7 @@
    __gcov_flush();
  #endif
    pthread_kill(pthread_self(), sig);
diff --git a/databases/mysql5-server/patches/patch-cc b/databases/mysql5-server/patches/patch-cc
index 0000de495a7..c1bf0cd3106 100644
--- a/databases/mysql5-server/patches/patch-cc
+++ b/databases/mysql5-server/patches/patch-cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-cc,v 1.1 2008/01/22 00:42:00 rillig Exp $
+$NetBSD: patch-cc,v 1.1.6.1 2008/09/23 11:15:53 tron Exp $
 
 See patch-ca.
 
---- sql/stacktrace.c.orig	2007-11-15 15:06:35.000000000 +0100
-+++ sql/stacktrace.c	2008-01-22 01:17:08.000000000 +0100
-@@ -251,7 +251,7 @@ void write_core(int sig)
+--- sql/stacktrace.c.orig	2008-08-04 15:20:12.000000000 +0300
++++ sql/stacktrace.c	2008-09-16 13:53:45.000000000 +0300
+@@ -252,7 +252,7 @@
    __gcov_flush();
  #endif
    pthread_kill(pthread_self(), sig);
diff --git a/databases/mysql5-server/patches/patch-da b/databases/mysql5-server/patches/patch-da
deleted file mode 100644
index 5bf92d88808..00000000000
--- a/databases/mysql5-server/patches/patch-da
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-da,v 1.1 2008/07/01 09:22:59 tron Exp $
-
---- sql/mysql_priv.h.orig	2008-06-30 16:02:02.000000000 +0100
-+++ sql/mysql_priv.h	2008-06-30 15:30:15.000000000 +0100
-@@ -1255,6 +1255,7 @@
- extern time_t server_start_time, flush_status_time;
- extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH],
- 	    mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[],
-+	    mysql_unpacked_real_data_home[],
-             def_ft_boolean_syntax[sizeof(ft_boolean_syntax)];
- #define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))
- extern MY_TMPDIR mysql_tmpdir_list;
diff --git a/databases/mysql5-server/patches/patch-db b/databases/mysql5-server/patches/patch-db
deleted file mode 100644
index 9e5a15f682b..00000000000
--- a/databases/mysql5-server/patches/patch-db
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-db,v 1.1 2008/07/01 09:22:59 tron Exp $
-
---- sql/sql_parse.cc.orig	2008-06-30 16:02:02.000000000 +0100
-+++ sql/sql_parse.cc	2008-06-30 15:56:34.000000000 +0100
-@@ -77,6 +77,8 @@
- 			       const char *table_name);
- static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
- 
-+static bool test_if_data_home_dir(const char *dir);
-+
- const char *any_db="*any*";	// Special symbol for check_access
- 
- const char *command_name[]={
-@@ -3001,6 +3003,20 @@
-                    "INDEX DIRECTORY option ignored");
-     create_info.data_file_name= create_info.index_file_name= NULL;
- #else
-+
-+    if (test_if_data_home_dir(lex->create_info.data_file_name))
-+    {
-+      my_error(ER_WRONG_ARGUMENTS,MYF(0),"DATA DIRECORY");
-+      res= -1;
-+      break;
-+    }
-+    if (test_if_data_home_dir(lex->create_info.index_file_name))
-+    {
-+      my_error(ER_WRONG_ARGUMENTS,MYF(0),"INDEX DIRECORY");
-+      res= -1;
-+      break;
-+    }
-+
-     /* Fix names if symlinked tables */
-     if (append_file_to_dir(thd, &create_info.data_file_name,
- 			   create_table->table_name) ||
-@@ -7717,6 +7733,50 @@
-   return new Item_func_not(expr);
- }
- 
-+
-+/*
-+  Check if path does not contain mysql data home directory
-+
-+  SYNOPSIS
-+    test_if_data_home_dir()
-+    dir                     directory
-+    conv_home_dir           converted data home directory
-+    home_dir_len            converted data home directory length
-+
-+  RETURN VALUES
-+    0	ok
-+    1	error  
-+*/
-+
-+static bool test_if_data_home_dir(const char *dir)
-+{
-+  char path[FN_REFLEN], conv_path[FN_REFLEN];
-+  uint dir_len, home_dir_len= strlen(mysql_unpacked_real_data_home);
-+  DBUG_ENTER("test_if_data_home_dir");
-+
-+  if (!dir)
-+    DBUG_RETURN(0);
-+
-+  (void) fn_format(path, dir, "", "",
-+                   (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS));
-+  dir_len= unpack_dirname(conv_path, dir);
-+
-+  if (home_dir_len <= dir_len)
-+  {
-+    if (lower_case_file_system)
-+    {
-+      if (!my_strnncoll(default_charset_info, (const uchar*) conv_path,
-+                        home_dir_len,
-+                        (const uchar*) mysql_unpacked_real_data_home,
-+                        home_dir_len))
-+        DBUG_RETURN(1);
-+    }
-+    else if (!memcmp(conv_path, mysql_unpacked_real_data_home, home_dir_len))
-+      DBUG_RETURN(1);
-+  }
-+  DBUG_RETURN(0);
-+}
-+
- /*
-   Set the specified definer to the default value, which is the current user in
-   the thread.
author	tron <tron@pkgsrc.org>	2008-09-23 11:15:53 +0000
committer	tron <tron@pkgsrc.org>	2008-09-23 11:15:53 +0000
commit	c9fd472ba51ec9d4741b2a5efd07dd10324cd651 (patch)
tree	8fb24b82c7a191fd8a54056069a08cf8827a424d
parent	ac2c06ecc724e4fe7f2a031fcb5000992e58e424 (diff)
download	pkgsrc-c9fd472ba51ec9d4741b2a5efd07dd10324cd651.tar.gz