From 32384a665379e27a38135a9b4b082b4fd1132a67 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Mon, 31 Oct 2005 09:22:26 +0000
Subject: Initial import of mysql5-server-5.0.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.
---
 databases/mysql5-server/DEINSTALL        |   16 +
 databases/mysql5-server/DESCR            |   15 +
 databases/mysql5-server/MESSAGE          |   33 +
 databases/mysql5-server/Makefile         |   58 ++
 databases/mysql5-server/PLIST            | 1195 ++++++++++++++++++++++++++++++
 databases/mysql5-server/distinfo         |   17 +
 databases/mysql5-server/files/mysqld.sh  |  103 +++
 databases/mysql5-server/patches/patch-aa |   19 +
 databases/mysql5-server/patches/patch-ab |   32 +
 databases/mysql5-server/patches/patch-ac |   13 +
 databases/mysql5-server/patches/patch-ad |   22 +
 databases/mysql5-server/patches/patch-ae |   13 +
 databases/mysql5-server/patches/patch-af |   33 +
 databases/mysql5-server/patches/patch-ag |   21 +
 databases/mysql5-server/patches/patch-ah |   21 +
 databases/mysql5-server/patches/patch-ai |   30 +
 databases/mysql5-server/patches/patch-aj |  103 +++
 databases/mysql5-server/patches/patch-ak |   20 +
 databases/mysql5-server/patches/patch-al |   13 +
 19 files changed, 1777 insertions(+)
 create mode 100644 databases/mysql5-server/DEINSTALL
 create mode 100644 databases/mysql5-server/DESCR
 create mode 100644 databases/mysql5-server/MESSAGE
 create mode 100644 databases/mysql5-server/Makefile
 create mode 100644 databases/mysql5-server/PLIST
 create mode 100644 databases/mysql5-server/distinfo
 create mode 100644 databases/mysql5-server/files/mysqld.sh
 create mode 100644 databases/mysql5-server/patches/patch-aa
 create mode 100644 databases/mysql5-server/patches/patch-ab
 create mode 100644 databases/mysql5-server/patches/patch-ac
 create mode 100644 databases/mysql5-server/patches/patch-ad
 create mode 100644 databases/mysql5-server/patches/patch-ae
 create mode 100644 databases/mysql5-server/patches/patch-af
 create mode 100644 databases/mysql5-server/patches/patch-ag
 create mode 100644 databases/mysql5-server/patches/patch-ah
 create mode 100644 databases/mysql5-server/patches/patch-ai
 create mode 100644 databases/mysql5-server/patches/patch-aj
 create mode 100644 databases/mysql5-server/patches/patch-ak
 create mode 100644 databases/mysql5-server/patches/patch-al

(limited to 'databases')

diff --git a/databases/mysql5-server/DEINSTALL b/databases/mysql5-server/DEINSTALL
new file mode 100644
index 00000000000..e11f5d18cbd
--- /dev/null
+++ b/databases/mysql5-server/DEINSTALL
@@ -0,0 +1,16 @@
+# $NetBSD: DEINSTALL,v 1.1.1.1 2005/10/31 09:22:26 xtraeme 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/mysql5-server/DESCR b/databases/mysql5-server/DESCR
new file mode 100644
index 00000000000..02b7abc487b
--- /dev/null
+++ b/databases/mysql5-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/mysql5-server/MESSAGE b/databases/mysql5-server/MESSAGE
new file mode 100644
index 00000000000..c19eaea3af9
--- /dev/null
+++ b/databases/mysql5-server/MESSAGE
@@ -0,0 +1,33 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+You can start the MySQL server doing the following steps:
+
+$ echo "mysqld=yes" >> /etc/rc.conf # NetBSD or a system with rc.d
+
+If you are using PKG_RCD_SCRIPTS=YES, try the following:
+
+$ ${RCD_SCRIPTS_DIR}/mysqld start
+
+Otherwise try:
+
+$ ${LOCALBASE}/${RCD_SCRIPTS_EXAMPLEDIR}/mysqld start
+
+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/mysql5-server/Makefile b/databases/mysql5-server/Makefile
new file mode 100644
index 00000000000..11a88f5cbc1
--- /dev/null
+++ b/databases/mysql5-server/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+PKGNAME=		${DISTNAME:S/-/-server-/}
+#PKGREVISION=		1
+SVR4_PKGNAME=		mysqs
+COMMENT=		MySQL 5, a free SQL database (server)
+
+CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
+
+.include "../mysql5-client/Makefile.common"
+
+CONFIGURE_ARGS+=	--with-libwrap
+CONFIGURE_ARGS+=	--with-raid
+CONFIGURE_ARGS+=	--without-berkeley-db
+CONFIGURE_ARGS+=	--without-mysqlfs
+CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER}
+
+PTHREAD_OPTS+=		require
+CONFIGURE_ARGS+=	--with-pthreads
+
+USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+
+PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
+PKG_GROUPS=		${MYSQL_GROUP}
+RCD_SCRIPTS=		mysqld
+
+FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD} \
+			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
+BUILD_DIRS=		${WRKSRC} ${WRKSRC}/man
+
+.include "../../databases/mysql5-client/buildlink3.mk"
+BUILDLINK_DEPMETHOD.readline=build
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+
+post-configure:
+	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
+
+post-build:
+	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
+		${MAKE_FLAGS} mysqld_safe mysql_install_db
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1
+	#${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
+		${PREFIX}/bin/mysql_secure_installation
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
new file mode 100644
index 00000000000..d9d2f158fe2
--- /dev/null
+++ b/databases/mysql5-server/PLIST
@@ -0,0 +1,1195 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+bin/comp_err
+bin/innochecksum
+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/perror
+bin/replace
+bin/resolve_stack_dump
+bin/resolveip
+include/mysql/mysqld_ername.h
+include/mysql/mysqld_error.h
+include/mysql/sql_state.h
+lib/mysql/libdbug.a
+lib/mysql/libheap.a
+lib/mysql/libmyisam.a
+lib/mysql/libmyisammrg.a
+lib/mysql/libmystrings.a
+lib/mysql/libmysys.a
+lib/mysql/libvio.a
+libexec/mysqld
+man/man1/mysqld.1
+man/man1/mysqld_multi.1
+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/big_test.inc
+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/federated.inc
+share/mysql-test/include/federated_cleanup.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_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_eucjpms.inc
+share/mysql-test/include/have_exampledb.inc
+share/mysql-test/include/have_federated_db.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_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/im_check_os.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/ndb_default_cluster.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/show_msg.inc
+share/mysql-test/include/show_msg80.inc
+share/mysql-test/include/system_db_struct.inc
+share/mysql-test/include/test_outfile.inc
+share/mysql-test/include/testdb_only.inc
+share/mysql-test/include/varchar.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/mysql-test-run
+share/mysql-test/r/alias.result
+share/mysql-test/r/alter_table.result
+share/mysql-test/r/analyse.result
+share/mysql-test/r/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/binlog.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/cast.result
+share/mysql-test/r/check.result
+share/mysql-test/r/check_var_limit.require
+share/mysql-test/r/client_xml.result
+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_create.result
+share/mysql-test/r/ctype_eucjpms.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_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_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/default.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/federated.result
+share/mysql-test/r/federated_archive.result
+share/mysql-test/r/federated_bug_13118.result
+share/mysql-test/r/flush.result
+share/mysql-test/r/flush_block_commit.result
+share/mysql-test/r/flush_read_lock_kill.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/grant3.result
+share/mysql-test/r/grant_cache.result
+share/mysql-test/r/greedy_optimizer.result
+share/mysql-test/r/group_by.result
+share/mysql-test/r/group_min_max.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_eucjpms.require
+share/mysql-test/r/have_exampledb.require
+share/mysql-test/r/have_federated_db.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_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/im_daemon_life_cycle.result
+share/mysql-test/r/im_life_cycle.result
+share/mysql-test/r/im_options_set.result
+share/mysql-test/r/im_options_unset.result
+share/mysql-test/r/im_utils.result
+share/mysql-test/r/index_merge.result
+share/mysql-test/r/index_merge_bdb.result
+share/mysql-test/r/index_merge_innodb.result
+share/mysql-test/r/index_merge_innodb2.result
+share/mysql-test/r/index_merge_ror.result
+share/mysql-test/r/index_merge_ror_cpk.result
+share/mysql-test/r/information_schema.result
+share/mysql-test/r/information_schema_db.result
+share/mysql-test/r/information_schema_inno.result
+share/mysql-test/r/init_connect.result
+share/mysql-test/r/innodb-big.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/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_nested.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_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/lowercase_view.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.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-max.result
+share/mysql-test/r/mysqldump.result
+share/mysql-test/r/mysqlshow.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_basic.result
+share/mysql-test/r/ndb_bitfield.result
+share/mysql-test/r/ndb_blob.result
+share/mysql-test/r/ndb_cache.result
+share/mysql-test/r/ndb_cache2.result
+share/mysql-test/r/ndb_cache_multi.result
+share/mysql-test/r/ndb_cache_multi2.result
+share/mysql-test/r/ndb_charset.result
+share/mysql-test/r/ndb_condition_pushdown.result
+share/mysql-test/r/ndb_config.result
+share/mysql-test/r/ndb_database.result
+share/mysql-test/r/ndb_default_cluster.require
+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_lock.result
+share/mysql-test/r/ndb_minmax.result
+share/mysql-test/r/ndb_multi.result
+share/mysql-test/r/ndb_read_multi_range.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/rowid_order_bdb.result
+share/mysql-test/r/rowid_order_innodb.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_auto_increment.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_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_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_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_status.result
+share/mysql-test/r/rpl_sp.result
+share/mysql-test/r/rpl_sp_effects.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_trigger.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/rpl_view.result
+share/mysql-test/r/schema.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/server_id.require
+share/mysql-test/r/server_id1.require
+share/mysql-test/r/show_check.result
+share/mysql-test/r/skip_grants.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/sp-big.result
+share/mysql-test/r/sp-dynamic.result
+share/mysql-test/r/sp-error.result
+share/mysql-test/r/sp-goto.result
+share/mysql-test/r/sp-prelocking.result
+share/mysql-test/r/sp-security.result
+share/mysql-test/r/sp-threads.result
+share/mysql-test/r/sp.result
+share/mysql-test/r/sp_trans.result
+share/mysql-test/r/sql_mode.result
+share/mysql-test/r/status.result
+share/mysql-test/r/strict.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/sum_distinct-big.result
+share/mysql-test/r/sum_distinct.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/testdb_only.require
+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/trigger.result
+share/mysql-test/r/true.require
+share/mysql-test/r/truncate.result
+share/mysql-test/r/type_binary.result
+share/mysql-test/r/type_bit.result
+share/mysql-test/r/type_bit_innodb.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_newdecimal.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_varchar.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_limits.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/view.result
+share/mysql-test/r/view_grant.result
+share/mysql-test/r/view_query_cache.result
+share/mysql-test/r/wait_timeout.result
+share/mysql-test/r/warnings.result
+share/mysql-test/r/windows.result
+share/mysql-test/r/xa.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/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/ndb_config_mycnf1.cnf
+share/mysql-test/std_data/ndb_config_mycnf2.cnf
+share/mysql-test/std_data/rpl_loaddata.dat
+share/mysql-test/std_data/rpl_loaddata2.dat
+share/mysql-test/std_data/rpl_timezone.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/vchar.frm
+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/binlog-master.opt
+share/mysql-test/t/binlog.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/client_xml.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_create.test
+share/mysql-test/t/ctype_eucjpms.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_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_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/default.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/federated.test
+share/mysql-test/t/federated_archive.test
+share/mysql-test/t/federated_bug_13118.test
+share/mysql-test/t/flush.test
+share/mysql-test/t/flush_block_commit.test
+share/mysql-test/t/flush_read_lock_kill-master.opt
+share/mysql-test/t/flush_read_lock_kill.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/grant3-master.opt
+share/mysql-test/t/grant3.test
+share/mysql-test/t/grant_cache.test
+share/mysql-test/t/greedy_optimizer.test
+share/mysql-test/t/group_by.test
+share/mysql-test/t/group_min_max.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/im_daemon_life_cycle-im.opt
+share/mysql-test/t/im_daemon_life_cycle.imtest
+share/mysql-test/t/im_life_cycle.imtest
+share/mysql-test/t/im_options_set.imtest
+share/mysql-test/t/im_options_unset.imtest
+share/mysql-test/t/im_utils.imtest
+share/mysql-test/t/index_merge.test
+share/mysql-test/t/index_merge_bdb.test
+share/mysql-test/t/index_merge_innodb.test
+share/mysql-test/t/index_merge_innodb2.test
+share/mysql-test/t/index_merge_ror.test
+share/mysql-test/t/index_merge_ror_cpk.test
+share/mysql-test/t/information_schema.test
+share/mysql-test/t/information_schema_db.test
+share/mysql-test/t/information_schema_inno.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-big.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/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/join.test
+share/mysql-test/t/join_crash.test
+share/mysql-test/t/join_nested.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/kill_n_check.sh
+share/mysql-test/t/limit.test
+share/mysql-test/t/loaddata.test
+share/mysql-test/t/lock.test
+share/mysql-test/t/lock_multi.test
+share/mysql-test/t/lock_tables_lost_commit-master.opt
+share/mysql-test/t/lock_tables_lost_commit.test
+share/mysql-test/t/lowercase_table-master.opt
+share/mysql-test/t/lowercase_table.test
+share/mysql-test/t/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/lowercase_view-master.opt
+share/mysql-test/t/lowercase_view.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.test
+share/mysql-test/t/mysql_client_test.test
+share/mysql-test/t/mysql_delimiter.sql
+share/mysql-test/t/mysql_delimiter_source.sql
+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-max.test
+share/mysql-test/t/mysqldump.test
+share/mysql-test/t/mysqlshow.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_basic.test
+share/mysql-test/t/ndb_bitfield.test
+share/mysql-test/t/ndb_blob.test
+share/mysql-test/t/ndb_cache.test
+share/mysql-test/t/ndb_cache2.test
+share/mysql-test/t/ndb_cache_multi.test
+share/mysql-test/t/ndb_cache_multi2.test
+share/mysql-test/t/ndb_charset.test
+share/mysql-test/t/ndb_condition_pushdown.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_lock.test
+share/mysql-test/t/ndb_minmax.test
+share/mysql-test/t/ndb_multi.test
+share/mysql-test/t/ndb_read_multi_range.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.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/rowid_order_bdb.test
+share/mysql-test/t/rowid_order_innodb.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_auto_increment-master.opt
+share/mysql-test/t/rpl_auto_increment.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_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_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_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_status.test
+share/mysql-test/t/rpl_sp-master.opt
+share/mysql-test/t/rpl_sp-slave.opt
+share/mysql-test/t/rpl_sp.test
+share/mysql-test/t/rpl_sp_effects-master.opt
+share/mysql-test/t/rpl_sp_effects-slave.opt
+share/mysql-test/t/rpl_sp_effects.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_trigger.test
+share/mysql-test/t/rpl_until.test
+share/mysql-test/t/rpl_user_variables.test
+share/mysql-test/t/rpl_variables-master.opt
+share/mysql-test/t/rpl_variables.test
+share/mysql-test/t/rpl_view.test
+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/show_check.test
+share/mysql-test/t/skip_grants-master.opt
+share/mysql-test/t/skip_grants.test
+share/mysql-test/t/skip_name_resolve-master.opt
+share/mysql-test/t/skip_name_resolve.test
+share/mysql-test/t/sp-big.test
+share/mysql-test/t/sp-dynamic.test
+share/mysql-test/t/sp-error.test
+share/mysql-test/t/sp-goto.test
+share/mysql-test/t/sp-prelocking.test
+share/mysql-test/t/sp-security.test
+share/mysql-test/t/sp-threads.test
+share/mysql-test/t/sp.test
+share/mysql-test/t/sp_trans.test
+share/mysql-test/t/sql_mode.test
+share/mysql-test/t/status.test
+share/mysql-test/t/strict.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/sum_distinct-big.test
+share/mysql-test/t/sum_distinct.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/trigger.test
+share/mysql-test/t/truncate.test
+share/mysql-test/t/type_binary.test
+share/mysql-test/t/type_bit.test
+share/mysql-test/t/type_bit_innodb.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_newdecimal.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_varchar.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_limits.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/view.test
+share/mysql-test/t/view_grant.test
+share/mysql-test/t/view_query_cache.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-test/t/xa.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/danish/errmsg.sys
+share/mysql/dutch/errmsg.sys
+share/mysql/english/errmsg.sys
+share/mysql/errmsg.txt
+share/mysql/estonian/errmsg.sys
+share/mysql/french/errmsg.sys
+share/mysql/german/errmsg.sys
+share/mysql/greek/errmsg.sys
+share/mysql/hungarian/errmsg.sys
+share/mysql/italian/errmsg.sys
+share/mysql/japanese/errmsg.sys
+share/mysql/korean/errmsg.sys
+share/mysql/mi_test_all
+share/mysql/mi_test_all.res
+share/mysql/mysql.server
+share/mysql/norwegian-ny/errmsg.sys
+share/mysql/norwegian/errmsg.sys
+share/mysql/polish/errmsg.sys
+share/mysql/portuguese/errmsg.sys
+share/mysql/romanian/errmsg.sys
+share/mysql/russian/errmsg.sys
+share/mysql/serbian/errmsg.sys
+share/mysql/slovak/errmsg.sys
+share/mysql/spanish/errmsg.sys
+share/mysql/swedish/errmsg.sys
+share/mysql/ukrainian/errmsg.sys
+@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
+@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/mysql5-server/distinfo b/databases/mysql5-server/distinfo
new file mode 100644
index 00000000000..aac94c1cc83
--- /dev/null
+++ b/databases/mysql5-server/distinfo
@@ -0,0 +1,17 @@
+$NetBSD: distinfo,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+SHA1 (mysql-5.0.15.tar.gz) = b6092615de6ef5f861f91810413007c1c63058cf
+RMD160 (mysql-5.0.15.tar.gz) = 6a8007f5d12b945b8c3560d27abe98d41abecaf5
+Size (mysql-5.0.15.tar.gz) = 18813065 bytes
+SHA1 (patch-aa) = 5a8dbc480982f6e9bead88a60c714f27584c3e43
+SHA1 (patch-ab) = 56cd26b3eb125e7d9b7775c9e148118bbd3dc6b3
+SHA1 (patch-ac) = dd8cc3e1fdeba9ca2f6ab1e0a66be79877c43289
+SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2
+SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (patch-af) = 33c7caa6fe6a61da2a60a63a058cfdbd85af1e2d
+SHA1 (patch-ag) = 178e2e96460b63abd001bd48b5af6f051762652b
+SHA1 (patch-ah) = 08d9f45260cb3cbece19561d021ffeb53b918835
+SHA1 (patch-ai) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
+SHA1 (patch-aj) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
+SHA1 (patch-ak) = 516460b0aa9f641d74f83c5514f258a980033e41
+SHA1 (patch-al) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17
diff --git a/databases/mysql5-server/files/mysqld.sh b/databases/mysql5-server/files/mysqld.sh
new file mode 100644
index 00000000000..d7036a207e0
--- /dev/null
+++ b/databases/mysql5-server/files/mysqld.sh
@@ -0,0 +1,103 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: mysqld.sh,v 1.1.1.1 2005/10/31 09:22:26 xtraeme 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/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa
new file mode 100644
index 00000000000..d4e1014363f
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- Makefile.in.orig	2005-10-31 09:34:47.000000000 +0100
++++ Makefile.in	2005-10-31 09:35:11.000000000 +0100
+@@ -359,12 +359,8 @@
+ 
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
+-			@readline_topdir@ sql-common \
+-			@thread_dirs@ pstack \
+-			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			netware @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @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/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab
new file mode 100644
index 00000000000..ffe8a4b2fd1
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ab
@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- tests/Makefile.in.orig	2005-10-31 09:35:35.000000000 +0100
++++ tests/Makefile.in	2005-10-31 09:36:29.000000000 +0100
+@@ -100,7 +100,7 @@
+ am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
+ 	$(am__objects_1)
+ mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
+-am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
++am__DEPENDENCIES_1 =
+ am__DEPENDENCIES_2 =
+ mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
+@@ -112,7 +112,7 @@
+ thread_test_SOURCES = thread_test.c
+ thread_test_OBJECTS = thread_test.$(OBJEXT)
+ thread_test_LDADD = $(LDADD)
+-thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
++thread_test_DEPENDENCIES =
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -412,8 +412,7 @@
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ 			$(openssl_includes)
+ 
+-LDADD = @CLIENT_EXTRA_LDFLAGS@ \
+-                        $(top_builddir)/libmysql/libmysqlclient.la
++LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
+ 
+ mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
+ mysql_client_test_SOURCES = mysql_client_test.c $(yassl_dummy_link_fix)
diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac
new file mode 100644
index 00000000000..6fcfa2f4d47
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- mysql-test/Makefile.in.orig	2005-10-31 09:37:02.000000000 +0100
++++ mysql-test/Makefile.in	2005-10-31 09:37:57.000000000 +0100
+@@ -379,7 +379,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 mysql-test-run.pl install_test_db.sh valgrind.supp
+ EXTRA_DIST = $(EXTRA_SCRIPTS) 
+ test_SCRIPTS = mysql-test-run install_test_db 
diff --git a/databases/mysql5-server/patches/patch-ad b/databases/mysql5-server/patches/patch-ad
new file mode 100644
index 00000000000..0f1603af9b9
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- sql/mysqld.cc.orig	2005-10-17 03:27:30.000000000 +0200
++++ sql/mysqld.cc	2005-10-31 09:57:13.000000000 +0100
+@@ -171,7 +171,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;
+@@ -3276,7 +3276,7 @@
+   init_ssl();
+ 
+ #ifdef HAVE_LIBWRAP
+-  libwrapName= my_progname+dirname_length(my_progname);
++  libwrapName= (char *)my_progname+dirname_length(my_progname);
+   openlog(libwrapName, LOG_PID, LOG_AUTH);
+ #endif
+ 
diff --git a/databases/mysql5-server/patches/patch-ae b/databases/mysql5-server/patches/patch-ae
new file mode 100644
index 00000000000..7545d80c591
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2005/10/31 09:22:26 xtraeme 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/mysql5-server/patches/patch-af b/databases/mysql5-server/patches/patch-af
new file mode 100644
index 00000000000..de1c806a75d
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- configure.orig	2005-10-31 09:38:34.000000000 +0100
++++ configure	2005-10-31 09:40:09.000000000 +0100
+@@ -21984,7 +21984,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*)
+@@ -26258,6 +26258,10 @@
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
++  *dragonfly*)
++    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    ;;
++
+   *freebsd*)
+     { echo "$as_me:$LINENO: WARNING: Adding fix for interrupted reads" >&5
+ echo "$as_me: WARNING: Adding fix for interrupted reads" >&2;}
+@@ -39729,7 +39733,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/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
new file mode 100644
index 00000000000..61c8fa98317
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- include/Makefile.in.orig	2005-10-31 09:40:49.000000000 +0100
++++ include/Makefile.in	2005-10-31 09:41:21.000000000 +0100
+@@ -338,14 +338,8 @@
+ yassl_dir = @yassl_dir@
+ yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+ 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 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 \
+-			mysql_time.h $(BUILT_SOURCES)
++BUILT_SOURCES =
++pkginclude_HEADERS =
+ 
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ 			heap.h my_bitmap.h\
diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah
new file mode 100644
index 00000000000..7532b670439
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ah
@@ -0,0 +1,21 @@
+$NetBSD: patch-ah,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- man/Makefile.in.orig	2005-10-31 09:41:52.000000000 +0100
++++ man/Makefile.in	2005-10-31 09:42:12.000000000 +0100
+@@ -334,14 +334,8 @@
+ yassl_dir = @yassl_dir@
+ yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \
+-		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
+-		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
+-
+-EXTRA_DIST = mysql.1.in mysql_zap.1.in \
+-		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
+-		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
+-		mysqld_safe.1.in mysql_fix_privilege_tables.1.in
++man_MANS = mysqld.1 mysqld_multi.1
++EXTRA_DIST = mysqld.1.in mysqld_multi.1.in
+ 
+ CLEANFILES = $(man_MANS)
+ SUFFIXES = .in
diff --git a/databases/mysql5-server/patches/patch-ai b/databases/mysql5-server/patches/patch-ai
new file mode 100644
index 00000000000..82c7c4cdc5d
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ai
@@ -0,0 +1,30 @@
+$NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- include/my_pthread.h.orig	2003-12-14 21:23:47.000000000 +0000
++++ include/my_pthread.h	2003-12-20 12:09:31.000000000 +0000
+@@ -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
+@@ -301,7 +307,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/mysql5-server/patches/patch-aj b/databases/mysql5-server/patches/patch-aj
new file mode 100644
index 00000000000..579259e6fba
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-aj
@@ -0,0 +1,103 @@
+$NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- scripts/mysqld_safe.sh.orig	2005-01-17 15:16:35.000000000 +0100
++++ scripts/mysqld_safe.sh	2005-01-17 15:20:03.000000000 +0100
+@@ -253,6 +253,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
+@@ -263,18 +271,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
+@@ -287,11 +293,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
+@@ -299,7 +305,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
+@@ -311,7 +317,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
+ 
+@@ -324,7 +330,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 
+@@ -337,16 +343,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/mysql5-server/patches/patch-ak b/databases/mysql5-server/patches/patch-ak
new file mode 100644
index 00000000000..61a880cbaca
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ak
@@ -0,0 +1,20 @@
+$NetBSD: patch-ak,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- support-files/Makefile.in.orig	2005-09-27 00:00:34.000000000 +0200
++++ support-files/Makefile.in	2005-09-27 00:00:57.000000000 +0200
+@@ -345,14 +345,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/mysql5-server/patches/patch-al b/databases/mysql5-server/patches/patch-al
new file mode 100644
index 00000000000..3f746525925
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+
+--- myisam/Makefile.in.orig	2005-01-10 16:19:12.000000000 +0100
++++ myisam/Makefile.in	2005-01-10 16:19:21.000000000 +0100
+@@ -172,7 +172,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
++CCLD = $(CXX)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \
-- 
cgit v1.2.3