Update "mysql5-client" and "mysql5-server" packages to version 5.0.51.

This version fixes a lot of bugs including the security vulnerability
reported in CVE-2007-5969.

A complete list of the changes can be found here:
http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-51.html

9 files changed, 119 insertions, 136 deletions

diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 0218e42fa30..ab6361caf89 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/12/08 22:26:24 jnemeth Exp $
+# $NetBSD: Makefile,v 1.14 2007/12/14 13:36:52 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 SVR4_PKGNAME=		mysqc
-PKGREVISION=		2
 COMMENT=		MySQL 5, a free SQL database (client)
 
 CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 5d44e19e4af..60bc9c9a0a2 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.27 2007/10/16 23:49:00 tnn Exp $
+# $NetBSD: Makefile.common,v 1.28 2007/12/14 13:36:52 tron Exp $
 
-DISTNAME=		mysql-5.0.45
+DISTNAME=		mysql-5.0.51
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index 9028cbae9aa..0814a031b72 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2007/10/12 14:32:46 rillig Exp $
+$NetBSD: distinfo,v 1.21 2007/12/14 13:36:52 tron Exp $
 
-SHA1 (mysql-5.0.45.tar.gz) = a5fba8e004acc43ac1a576d728f10215f54ebe20
-RMD160 (mysql-5.0.45.tar.gz) = ee6717c65dc7bb6b5b596b90ef6c47c7fdebf5fb
-Size (mysql-5.0.45.tar.gz) = 24433261 bytes
+SHA1 (mysql-5.0.51.tar.gz) = a9a253ea842e973df6f475c04dac77522de0dea7
+RMD160 (mysql-5.0.51.tar.gz) = e14baa1c40cb385fa64fc72355db9ca58a6be2f9
+Size (mysql-5.0.51.tar.gz) = 27045586 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
 SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 768a3e97dde..b784fcd4073 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/07/31 14:10:11 obache Exp $
+# $NetBSD: Makefile,v 1.20 2007/12/14 13:36:53 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=		mysqs
@@ -36,7 +36,11 @@ MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
 BUILD_DEFS+=		MYSQL_DATADIR
 BUILD_DIRS=		. man
 
-REPLACE_PERL+=		mysql-test/mysql-test-run.pl
+REPLACE_PERL+=		mysql-test/mysql-test-run.pl \
+			mysql-test/suite/funcs_1/lib/DataGen_local.pl \
+			mysql-test/suite/funcs_1/lib/DataGen_modify.pl \
+			mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl \
+			mysql-test/mysql-stress-test.pl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -51,7 +55,7 @@ BUILDLINK_DEPMETHOD.readline=build
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
 post-configure:
-	cd ${WRKSRC} && cp -f config.h include/my_config.h
+	cd ${WRKSRC}/include && cp -f config.h my_config.h
 
 post-build:
 	cd ${WRKSRC}/scripts && env ${MAKE_ENV} ${MAKE_PROGRAM}	\
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 4cbd1d88e5d..bedb97bf634 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/07/15 19:22:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/12/14 13:36:53 tron Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -30,9 +30,6 @@ man/man8/mysqld.8
 man/man8/mysqlmanager.8
 share/examples/rc.d/mysqld
 share/mysql-test/README
-share/mysql-test/cacert.pem
-share/mysql-test/client-cert.pem
-share/mysql-test/client-key.pem
 share/mysql-test/include/add_anonymous_users.inc
 share/mysql-test/include/analyze_failure_sync_with_master.test
 share/mysql-test/include/big_test.inc
@@ -53,6 +50,7 @@ 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_bug25714.inc
 share/mysql-test/include/have_case_sensitive_file_system.inc
 share/mysql-test/include/have_compress.inc
 share/mysql-test/include/have_cp1250_ch.inc
@@ -114,6 +112,7 @@ share/mysql-test/include/uses_vardir.inc
 share/mysql-test/include/varchar.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
 share/mysql-test/include/wait_for_slave_sql_to_stop.inc
 share/mysql-test/include/wait_for_slave_to_start.inc
 share/mysql-test/include/wait_for_slave_to_stop.inc
@@ -135,6 +134,7 @@ share/mysql-test/lib/mtr_stress.pl
 share/mysql-test/lib/mtr_timer.pl
 share/mysql-test/lib/mtr_unique.pl
 share/mysql-test/mtr
+share/mysql-test/mysql-stress-test.pl
 share/mysql-test/mysql-test-run
 share/mysql-test/mysql-test-run-shell
 share/mysql-test/mysql-test-run.pl
@@ -144,6 +144,7 @@ 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-big.result
 share/mysql-test/r/archive.result
 share/mysql-test/r/archive_gis.result
 share/mysql-test/r/auto_increment.result
@@ -161,6 +162,7 @@ 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_innodb.result
 share/mysql-test/r/binlog_killed.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
@@ -185,6 +187,7 @@ share/mysql-test/r/create.result
 share/mysql-test/r/create_not_windows.result
 share/mysql-test/r/create_select_tmp.result
 share/mysql-test/r/csv.result
+share/mysql-test/r/ctype_ascii.result
 share/mysql-test/r/ctype_big5.result
 share/mysql-test/r/ctype_collate.result
 share/mysql-test/r/ctype_cp1250_ch.result
@@ -201,6 +204,7 @@ share/mysql-test/r/ctype_latin1.result
 share/mysql-test/r/ctype_latin1_de.result
 share/mysql-test/r/ctype_latin2.result
 share/mysql-test/r/ctype_latin2_ch.result
+share/mysql-test/r/ctype_ldml.result
 share/mysql-test/r/ctype_many.result
 share/mysql-test/r/ctype_mb.result
 share/mysql-test/r/ctype_recoding.result
@@ -231,6 +235,8 @@ 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/federated_bug_25714.result
+share/mysql-test/r/federated_innodb.result
 share/mysql-test/r/fix_priv_tables.result
 share/mysql-test/r/flush.result
 share/mysql-test/r/flush2.result
@@ -241,6 +247,7 @@ 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/fulltext3.result
 share/mysql-test/r/fulltext_cache.result
 share/mysql-test/r/fulltext_distinct.result
 share/mysql-test/r/fulltext_left_join.result
@@ -289,6 +296,7 @@ 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_bug25714.require
 share/mysql-test/r/have_compress.require
 share/mysql-test/r/have_cp1250_ch.require
 share/mysql-test/r/have_cp932.require
@@ -410,6 +418,7 @@ share/mysql-test/r/mysqlbinlog-cp932.result
 share/mysql-test/r/mysqlbinlog.result
 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.result
 share/mysql-test/r/mysqlshow.result
@@ -419,9 +428,11 @@ share/mysql-test/r/ndb_alter_table2.result
 share/mysql-test/r/ndb_autodiscover.result
 share/mysql-test/r/ndb_autodiscover2.result
 share/mysql-test/r/ndb_autodiscover3.result
+share/mysql-test/r/ndb_backup_print.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_bug26793.result
 share/mysql-test/r/ndb_cache.result
 share/mysql-test/r/ndb_cache2.result
 share/mysql-test/r/ndb_cache_multi.result
@@ -447,6 +458,7 @@ share/mysql-test/r/ndb_read_multi_range.result
 share/mysql-test/r/ndb_rename.result
 share/mysql-test/r/ndb_replace.result
 share/mysql-test/r/ndb_restore.result
+share/mysql-test/r/ndb_restore_different_endian_data.result
 share/mysql-test/r/ndb_restore_print.result
 share/mysql-test/r/ndb_single_user.result
 share/mysql-test/r/ndb_subquery.result
@@ -471,6 +483,7 @@ 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/parser_precedence.result
 share/mysql-test/r/perror.result
 share/mysql-test/r/preload.result
 share/mysql-test/r/profiling.result
@@ -488,6 +501,7 @@ 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/query_cache_with_views.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
 share/mysql-test/r/read_only.result
@@ -537,6 +551,7 @@ 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_grant.result
 share/mysql-test/r/rpl_ignore_grant.result
 share/mysql-test/r/rpl_ignore_revoke.result
 share/mysql-test/r/rpl_ignore_table.result
@@ -625,7 +640,9 @@ share/mysql-test/r/sp_stress_case.result
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sp_trans_log.result
 share/mysql-test/r/sql_mode.result
+share/mysql-test/r/ssl-big.result
 share/mysql-test/r/ssl.result
+share/mysql-test/r/ssl_8k_key.result
 share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/ssl_connect.result
 share/mysql-test/r/status.result
@@ -692,14 +709,13 @@ share/mysql-test/r/variables-big.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/windows_shm.result
 share/mysql-test/r/xa.result
-share/mysql-test/server-cert.pem
-share/mysql-test/server-key.pem
 share/mysql-test/std_data/14897.frm
+share/mysql-test/std_data/Index.xml
 share/mysql-test/std_data/Moscow_leap
 share/mysql-test/std_data/bad_gis_data.dat
 share/mysql-test/std_data/bug15328.cnf
@@ -721,6 +737,18 @@ share/mysql-test/std_data/loaddata6.dat
 share/mysql-test/std_data/loaddata_dq.dat
 share/mysql-test/std_data/loaddata_pair.dat
 share/mysql-test/std_data/master-bin.000001
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
 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
@@ -730,6 +758,8 @@ share/mysql-test/std_data/server-cert-des.pem
 share/mysql-test/std_data/server-cert.pem
 share/mysql-test/std_data/server-key-des.pem
 share/mysql-test/std_data/server-key.pem
+share/mysql-test/std_data/server8k-cert.pem
+share/mysql-test/std_data/server8k-key.pem
 share/mysql-test/std_data/trunc_binlog.000001
 share/mysql-test/std_data/untrusted-cacert.pem
 share/mysql-test/std_data/vchar.frm
@@ -786,6 +816,8 @@ 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/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/innodb_bitdata.result
@@ -857,6 +889,8 @@ 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/disabled.def
 share/mysql-test/suite/funcs_1/t/innodb__datadict.test
 share/mysql-test/suite/funcs_1/t/innodb__load.test
@@ -948,95 +982,16 @@ 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/row_lock/include/row_lock.inc
-share/mysql-test/suite/row_lock/include/row_lock_big_tab.inc
-share/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
-share/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
-share/mysql-test/suite/row_lock/include/row_lock_trig.inc
-share/mysql-test/suite/row_lock/include/row_lock_view.inc
-share/mysql-test/suite/row_lock/include/row_lock_view_mix.inc
-share/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
-share/mysql-test/suite/row_lock/include/row_lock_view_trig.inc
-share/mysql-test/suite/row_lock/r/innodb_row_lock_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_3.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_4.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_5.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_3.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_4.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_5.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
-share/mysql-test/suite/row_lock/readme.txt
-share/mysql-test/suite/row_lock/summary_of_sel_test.txt
-share/mysql-test/suite/row_lock/t/innodb_row_lock_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_3.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_4.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_5.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_3.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_4.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_5.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.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/t/alias.test
 share/mysql-test/t/alter_table-big.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-big.test
 share/mysql-test/t/archive.test
 share/mysql-test/t/archive_gis.test
 share/mysql-test/t/auto_increment.test
@@ -1057,6 +1012,7 @@ 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_innodb.test
 share/mysql-test/t/binlog_killed.test
 share/mysql-test/t/blackhole.test
 share/mysql-test/t/bool.test
@@ -1080,6 +1036,7 @@ share/mysql-test/t/create.test
 share/mysql-test/t/create_not_windows.test
 share/mysql-test/t/create_select_tmp.test
 share/mysql-test/t/csv.test
+share/mysql-test/t/ctype_ascii.test
 share/mysql-test/t/ctype_big5.test
 share/mysql-test/t/ctype_collate.test
 share/mysql-test/t/ctype_cp1250_ch.test
@@ -1097,6 +1054,8 @@ share/mysql-test/t/ctype_latin1_de-master.opt
 share/mysql-test/t/ctype_latin1_de.test
 share/mysql-test/t/ctype_latin2.test
 share/mysql-test/t/ctype_latin2_ch.test
+share/mysql-test/t/ctype_ldml-master.opt
+share/mysql-test/t/ctype_ldml.test
 share/mysql-test/t/ctype_many.test
 share/mysql-test/t/ctype_mb.test
 share/mysql-test/t/ctype_recoding.test
@@ -1131,6 +1090,9 @@ 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/federated_bug_25714.test
+share/mysql-test/t/federated_innodb-slave.opt
+share/mysql-test/t/federated_innodb.test
 share/mysql-test/t/fix_priv_tables.test
 share/mysql-test/t/flush.test
 share/mysql-test/t/flush2-master.opt
@@ -1143,6 +1105,7 @@ 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/fulltext3.test
 share/mysql-test/t/fulltext_cache.test
 share/mysql-test/t/fulltext_distinct.test
 share/mysql-test/t/fulltext_left_join.test
@@ -1305,6 +1268,8 @@ share/mysql-test/t/mysqlbinlog-master.opt
 share/mysql-test/t/mysqlbinlog.test
 share/mysql-test/t/mysqlbinlog2.test
 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.test
 share/mysql-test/t/mysqlshow.test
@@ -1315,9 +1280,11 @@ share/mysql-test/t/ndb_autodiscover.test
 share/mysql-test/t/ndb_autodiscover2-master.opt
 share/mysql-test/t/ndb_autodiscover2.test
 share/mysql-test/t/ndb_autodiscover3.test
+share/mysql-test/t/ndb_backup_print.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_bug26793.test
 share/mysql-test/t/ndb_cache.test
 share/mysql-test/t/ndb_cache2.test
 share/mysql-test/t/ndb_cache_multi.test
@@ -1341,6 +1308,7 @@ share/mysql-test/t/ndb_read_multi_range.test
 share/mysql-test/t/ndb_rename.test
 share/mysql-test/t/ndb_replace.test
 share/mysql-test/t/ndb_restore.test
+share/mysql-test/t/ndb_restore_different_endian_data.test
 share/mysql-test/t/ndb_restore_print.test
 share/mysql-test/t/ndb_single_user.test
 share/mysql-test/t/ndb_subquery.test
@@ -1363,6 +1331,7 @@ 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/parser_precedence.test
 share/mysql-test/t/perror.test
 share/mysql-test/t/preload.test
 share/mysql-test/t/profiling.test
@@ -1381,6 +1350,7 @@ 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/query_cache_with_views.test
 share/mysql-test/t/raid.test
 share/mysql-test/t/range.test
 share/mysql-test/t/read_only.test
@@ -1455,6 +1425,7 @@ 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_grant.test
 share/mysql-test/t/rpl_ignore_grant-slave.opt
 share/mysql-test/t/rpl_ignore_grant.test
 share/mysql-test/t/rpl_ignore_revoke-slave.opt
@@ -1579,7 +1550,9 @@ share/mysql-test/t/sp_stress_case.test
 share/mysql-test/t/sp_trans.test
 share/mysql-test/t/sp_trans_log.test
 share/mysql-test/t/sql_mode.test
+share/mysql-test/t/ssl-big.test
 share/mysql-test/t/ssl.test
+share/mysql-test/t/ssl_8k_key.test
 share/mysql-test/t/ssl_compress.test
 share/mysql-test/t/ssl_connect.test
 share/mysql-test/t/status.test
@@ -1655,7 +1628,6 @@ share/mysql-test/t/variables-big.test
 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_for_process.sh
 share/mysql-test/t/wait_for_socket.sh
 share/mysql-test/t/wait_timeout-master.opt
@@ -1663,6 +1635,8 @@ 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
@@ -1706,6 +1680,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/mi_test_all
 share/mysql/mi_test_all.res
 share/mysql/mysql.server
+share/mysql/mysqld_multi.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian/errmsg.sys
 share/mysql/polish/errmsg.sys
@@ -1742,10 +1717,9 @@ share/mysql/ukrainian/errmsg.sys
 @dirrm share/mysql/czech
 @dirrm share/mysql/charsets
 @dirrm share/mysql-test/t
-@dirrm share/mysql-test/suite/row_lock/t
-@dirrm share/mysql-test/suite/row_lock/r
-@dirrm share/mysql-test/suite/row_lock/include
-@dirrm share/mysql-test/suite/row_lock
+@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/funcs_2/t
 @dirrm share/mysql-test/suite/funcs_2/r
 @dirrm share/mysql-test/suite/funcs_2/lib
@@ -1766,6 +1740,8 @@ share/mysql/ukrainian/errmsg.sys
 @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
 @dirrm share/mysql-test/r
 @dirrm share/mysql-test/lib
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 64b51c66fac..c77f037bf85 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2007/07/15 19:22:07 tron Exp $
+$NetBSD: distinfo,v 1.17 2007/12/14 13:36:53 tron Exp $
 
-SHA1 (mysql-5.0.45.tar.gz) = a5fba8e004acc43ac1a576d728f10215f54ebe20
-RMD160 (mysql-5.0.45.tar.gz) = ee6717c65dc7bb6b5b596b90ef6c47c7fdebf5fb
-Size (mysql-5.0.45.tar.gz) = 24433261 bytes
+SHA1 (mysql-5.0.51.tar.gz) = a9a253ea842e973df6f475c04dac77522de0dea7
+RMD160 (mysql-5.0.51.tar.gz) = e14baa1c40cb385fa64fc72355db9ca58a6be2f9
+Size (mysql-5.0.51.tar.gz) = 27045586 bytes
 SHA1 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023
-SHA1 (patch-ab) = d79d5eb4c9e8c939da4bf34e8d7f3f5a52e41a10
+SHA1 (patch-ab) = 7d3ff56e929f93b4843d62014a3f5f37cc1e84bc
 SHA1 (patch-ad) = 2956a12d9a5a053fd5dd380f856475242e8c1199
 SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
 SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
@@ -12,8 +12,8 @@ SHA1 (patch-ag) = 7c12975196f504c76954bfe92ffff0a98ba63019
 SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597
 SHA1 (patch-ai) = c8ba7dfe00f37682e3f521314fe4225aa0b8e4a3
 SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
-SHA1 (patch-ak) = 9df4e5ba12598363e880f2270806aa5a468a0cee
+SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea
 SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1
 SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
-SHA1 (patch-an) = cfba5c557e555c5e7b29491a0383ca290dfb45fa
+SHA1 (patch-an) = b657862771fbc4f6ba748e5b02e4eae51fa87ac1
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab
index fce429272ff..16e0f059a27 100644
--- a/databases/mysql5-server/patches/patch-ab
+++ b/databases/mysql5-server/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2007/03/11 18:42:49 adam Exp $
+$NetBSD: patch-ab,v 1.5 2007/12/14 13:36:54 tron Exp $
 
---- tests/Makefile.in.orig	2007-03-05 20:23:23.000000000 +0100
-+++ tests/Makefile.in
-@@ -93,7 +93,7 @@ insert_test_LDADD = $(LDADD)
+--- tests/Makefile.in.orig	2007-11-15 14:08:50.000000000 +0000
++++ tests/Makefile.in	2007-12-13 23:57:31.000000000 +0000
+@@ -96,7 +96,7 @@
  am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
  	my_memmem.$(OBJEXT)
  mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.4 2007/03/11 18:42:49 adam Exp $
  am__DEPENDENCIES_2 =
  mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
-@@ -103,7 +103,7 @@ select_test_LDADD = $(LDADD)
+@@ -106,7 +106,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)
++thread_test_DEPENDENCIES =
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -397,8 +397,7 @@ EXTRA_DIST = auto_increment.res auto_inc
+@@ -404,8 +404,7 @@
  INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
  			$(openssl_includes)
  
diff --git a/databases/mysql5-server/patches/patch-ak b/databases/mysql5-server/patches/patch-ak
index b493466a112..62c567a483e 100644
--- a/databases/mysql5-server/patches/patch-ak
+++ b/databases/mysql5-server/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
+$NetBSD: patch-ak,v 1.4 2007/12/14 13:36:54 tron Exp $
 
---- support-files/Makefile.in.orig	2007-05-21 06:04:49.000000000 +0200
-+++ support-files/Makefile.in	2007-05-21 06:05:08.000000000 +0200
-@@ -380,14 +380,7 @@
+--- support-files/Makefile.in.orig	2007-11-15 14:08:49.000000000 +0000
++++ support-files/Makefile.in	2007-12-13 23:59:01.000000000 +0000
+@@ -383,14 +383,7 @@
  			compiler_warnings.supp
  
  SUBDIRS = MacOSX RHEL4-SElinux
@@ -16,5 +16,5 @@ $NetBSD: patch-ak,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
 -			ndb-config-2-node.ini
 +pkgdata_DATA =
  
- pkgdata_SCRIPTS = mysql.server
- noinst_DATA = mysql-@VERSION@.spec \
+ pkgdata_SCRIPTS = mysql.server \
+ 			mysqld_multi.server
diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an
index 163359622ac..ba061818df4 100644
--- a/databases/mysql5-server/patches/patch-an
+++ b/databases/mysql5-server/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
+$NetBSD: patch-an,v 1.4 2007/12/14 13:36:54 tron Exp $
 
---- mysql-test/Makefile.in.orig	2007-05-21 06:02:04.000000000 +0200
-+++ mysql-test/Makefile.in	2007-05-21 06:03:13.000000000 +0200
-@@ -374,7 +374,7 @@
+--- 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 @@
  @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.3 2007/05/21 04:40:01 xtraeme 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
-@@ -770,12 +770,11 @@
+@@ -743,14 +743,13 @@
  	-rm -rf `find $(distdir)/suite -type d -name SCCS`
  
  install-data-local:
@@ -20,11 +20,15 @@ $NetBSD: patch-an,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
 -		$(DESTDIR)$(testdir)/r \
 -		$(DESTDIR)$(testdir)/include \
 -		$(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)/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
  	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
  	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t