Update to 5.0.41. Amongst many fixes these vulnerabilities were

fixed:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2583
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2692

And another patch adapted from a mailing list to fix:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2691

See http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-41.html
To see all changes.

7 files changed, 434 insertions, 94 deletions

diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 8aba6382e6b..c0fbc62a64d 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/03/11 18:42:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/05/21 04:40:00 xtraeme Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -33,6 +33,7 @@ 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
 share/mysql-test/include/check-testcase.test
@@ -42,6 +43,7 @@ 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/delete_anonymous_users.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
@@ -70,10 +72,10 @@ share/mysql-test/include/have_latin2_ch.inc
 share/mysql-test/include/have_lowercase0.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
-share/mysql-test/include/have_openssl.inc
 share/mysql-test/include/have_outfile.inc
 share/mysql-test/include/have_query_cache.inc
 share/mysql-test/include/have_sjis.inc
+share/mysql-test/include/have_ssl.inc
 share/mysql-test/include/have_tis620.inc
 share/mysql-test/include/have_ucs2.inc
 share/mysql-test/include/have_udf.inc
@@ -84,6 +86,8 @@ share/mysql-test/include/is_debug_build.inc
 share/mysql-test/include/loaddata_autocom.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
+share/mysql-test/include/ndb_backup.inc
+share/mysql-test/include/ndb_backup_print.inc
 share/mysql-test/include/ndb_default_cluster.inc
 share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_embedded.inc
@@ -110,7 +114,6 @@ share/mysql-test/include/wait_show_pattern.inc
 share/mysql-test/include/wait_slave_status.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
@@ -153,6 +156,7 @@ 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/bootstrap.result
 share/mysql-test/r/bulk_replace.result
 share/mysql-test/r/case.result
 share/mysql-test/r/case_sensitive_file_system.require
@@ -298,12 +302,12 @@ share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_mysql_upgrade.result
 share/mysql-test/r/have_ndb.require
 share/mysql-test/r/have_ndb_status_ok.require
-share/mysql-test/r/have_openssl.require
 share/mysql-test/r/have_outfile.require
 share/mysql-test/r/have_perror.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_ssl.require
 share/mysql-test/r/have_symlink.require
 share/mysql-test/r/have_tis620.require
 share/mysql-test/r/have_ucs2.require
@@ -337,6 +341,7 @@ 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-ucs2.result
 share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_gis.result
@@ -390,6 +395,7 @@ share/mysql-test/r/mysql_client_test.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysql_upgrade.result
 share/mysql-test/r/mysqladmin.result
+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
@@ -430,6 +436,8 @@ 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_print.result
+share/mysql-test/r/ndb_single_user.result
 share/mysql-test/r/ndb_subquery.result
 share/mysql-test/r/ndb_transaction.result
 share/mysql-test/r/ndb_trigger.result
@@ -522,10 +530,13 @@ share/mysql-test/r/rpl_ignore_revoke.result
 share/mysql-test/r/rpl_ignore_table.result
 share/mysql-test/r/rpl_init_slave.result
 share/mysql-test/r/rpl_innodb.result
+share/mysql-test/r/rpl_insert_delayed.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_known_bugs_detection.result
 share/mysql-test/r/rpl_loaddata.result
+share/mysql-test/r/rpl_loaddata_charset.result
 share/mysql-test/r/rpl_loaddata_rule_m.result
 share/mysql-test/r/rpl_loaddata_rule_s.result
 share/mysql-test/r/rpl_loaddatalocal.result
@@ -565,6 +576,7 @@ 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_ssl.result
 share/mysql-test/r/rpl_start_stop_slave.result
 share/mysql-test/r/rpl_temporary.result
 share/mysql-test/r/rpl_timezone.result
@@ -593,6 +605,7 @@ share/mysql-test/r/sp-error.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-ucs2.result
 share/mysql-test/r/sp-vars.result
 share/mysql-test/r/sp.result
 share/mysql-test/r/sp_notembedded.result
@@ -602,7 +615,6 @@ share/mysql-test/r/sql_mode.result
 share/mysql-test/r/ssl.result
 share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/ssl_connect.result
-share/mysql-test/r/ssl_des.result
 share/mysql-test/r/status.result
 share/mysql-test/r/strict.result
 share/mysql-test/r/strict_autoinc_1myisam.result
@@ -691,6 +703,7 @@ 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/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
@@ -708,6 +721,307 @@ share/mysql-test/std_data/untrusted-cacert.pem
 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/suite/funcs_1/README.txt
+share/mysql-test/suite/funcs_1/bitdata/bitdata_master.test
+share/mysql-test/suite/funcs_1/cursors/cursors_master.test
+share/mysql-test/suite/funcs_1/data/innodb_tb1.txt
+share/mysql-test/suite/funcs_1/data/innodb_tb2.txt
+share/mysql-test/suite/funcs_1/data/innodb_tb3.txt
+share/mysql-test/suite/funcs_1/data/innodb_tb4.txt
+share/mysql-test/suite/funcs_1/data/memory_tb1.txt
+share/mysql-test/suite/funcs_1/data/memory_tb2.txt
+share/mysql-test/suite/funcs_1/data/memory_tb3.txt
+share/mysql-test/suite/funcs_1/data/memory_tb4.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb1.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb2.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb3.txt
+share/mysql-test/suite/funcs_1/data/myisam_tb4.txt
+share/mysql-test/suite/funcs_1/data/t3.txt
+share/mysql-test/suite/funcs_1/data/t4.txt
+share/mysql-test/suite/funcs_1/data/t7.txt
+share/mysql-test/suite/funcs_1/data/t9.txt
+share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_load.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
+share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
+share/mysql-test/suite/funcs_1/include/create_database.inc
+share/mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
+share/mysql-test/suite/funcs_1/include/create_user_no_super.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb1.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb2.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb3.inc
+share/mysql-test/suite/funcs_1/include/innodb_tb4.inc
+share/mysql-test/suite/funcs_1/include/memory_tb1.inc
+share/mysql-test/suite/funcs_1/include/memory_tb2.inc
+share/mysql-test/suite/funcs_1/include/memory_tb3.inc
+share/mysql-test/suite/funcs_1/include/memory_tb4.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb1.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb2.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb3.inc
+share/mysql-test/suite/funcs_1/include/myisam_tb4.inc
+share/mysql-test/suite/funcs_1/include/show_connection.inc
+share/mysql-test/suite/funcs_1/include/sp_tb.inc
+share/mysql-test/suite/funcs_1/lib/DataGen_local.pl
+share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
+share/mysql-test/suite/funcs_1/r/a_version_check.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
+share/mysql-test/suite/funcs_1/r/innodb_cursors.result
+share/mysql-test/suite/funcs_1/r/innodb_func_view.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
+share/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
+share/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
+share/mysql-test/suite/funcs_1/r/innodb_triggers.result
+share/mysql-test/suite/funcs_1/r/innodb_views.result
+share/mysql-test/suite/funcs_1/r/innodb_views.warnings
+share/mysql-test/suite/funcs_1/r/memory__datadict.result
+share/mysql-test/suite/funcs_1/r/memory__load.result
+share/mysql-test/suite/funcs_1/r/memory_bitdata.result
+share/mysql-test/suite/funcs_1/r/memory_cursors.result
+share/mysql-test/suite/funcs_1/r/memory_func_view.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_03.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_07.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_08.result
+share/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
+share/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+share/mysql-test/suite/funcs_1/r/memory_trig_03.result
+share/mysql-test/suite/funcs_1/r/memory_trig_0407.result
+share/mysql-test/suite/funcs_1/r/memory_trig_08.result
+share/mysql-test/suite/funcs_1/r/memory_trig_09.result
+share/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
+share/mysql-test/suite/funcs_1/r/memory_triggers.result
+share/mysql-test/suite/funcs_1/r/memory_views.result
+share/mysql-test/suite/funcs_1/r/memory_views.warnings
+share/mysql-test/suite/funcs_1/r/myisam__datadict.result
+share/mysql-test/suite/funcs_1/r/myisam__load.result
+share/mysql-test/suite/funcs_1/r/myisam_bitdata.result
+share/mysql-test/suite/funcs_1/r/myisam_cursors.result
+share/mysql-test/suite/funcs_1/r/myisam_func_view.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
+share/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+share/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
+share/mysql-test/suite/funcs_1/r/myisam_triggers.result
+share/mysql-test/suite/funcs_1/r/myisam_views.result
+share/mysql-test/suite/funcs_1/r/myisam_views.warnings
+share/mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
+share/mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
+share/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
+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/a_version_check.test
+share/mysql-test/suite/funcs_1/t/disabled.def
+share/mysql-test/suite/funcs_1/t/innodb__datadict.test
+share/mysql-test/suite/funcs_1/t/innodb__load.test
+share/mysql-test/suite/funcs_1/t/innodb_bitdata.test
+share/mysql-test/suite/funcs_1/t/innodb_cursors.test
+share/mysql-test/suite/funcs_1/t/innodb_func_view.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
+share/mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_0102.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_03.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_0407.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_08.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_09.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
+share/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
+share/mysql-test/suite/funcs_1/t/innodb_views.test
+share/mysql-test/suite/funcs_1/t/memory__datadict.test
+share/mysql-test/suite/funcs_1/t/memory__load.test
+share/mysql-test/suite/funcs_1/t/memory_bitdata.test
+share/mysql-test/suite/funcs_1/t/memory_cursors.test
+share/mysql-test/suite/funcs_1/t/memory_func_view.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_02.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_03.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_06.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_07.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_08.test
+share/mysql-test/suite/funcs_1/t/memory_storedproc_10.test
+share/mysql-test/suite/funcs_1/t/memory_trig_0102.test
+share/mysql-test/suite/funcs_1/t/memory_trig_03.test
+share/mysql-test/suite/funcs_1/t/memory_trig_0407.test
+share/mysql-test/suite/funcs_1/t/memory_trig_08.test
+share/mysql-test/suite/funcs_1/t/memory_trig_09.test
+share/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
+share/mysql-test/suite/funcs_1/t/memory_views.test
+share/mysql-test/suite/funcs_1/t/myisam__datadict.test
+share/mysql-test/suite/funcs_1/t/myisam__load.test
+share/mysql-test/suite/funcs_1/t/myisam_bitdata.test
+share/mysql-test/suite/funcs_1/t/myisam_cursors.test
+share/mysql-test/suite/funcs_1/t/myisam_func_view.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
+share/mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_0102.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_03.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_0407.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_08.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_09.test
+share/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
+share/mysql-test/suite/funcs_1/t/myisam_views.test
+share/mysql-test/suite/funcs_1/triggers/trig_frkey.inc
+share/mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_03.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_08.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_09.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
+share/mysql-test/suite/funcs_1/triggers/triggers_master.test
+share/mysql-test/suite/funcs_1/views/func_view.inc
+share/mysql-test/suite/funcs_1/views/fv1.inc
+share/mysql-test/suite/funcs_1/views/fv2.inc
+share/mysql-test/suite/funcs_1/views/fv_cast.inc
+share/mysql-test/suite/funcs_1/views/fv_if1.inc
+share/mysql-test/suite/funcs_1/views/fv_if2.inc
+share/mysql-test/suite/funcs_1/views/fv_ifnull.inc
+share/mysql-test/suite/funcs_1/views/views_master.inc
+share/mysql-test/suite/funcs_2/charset/charset_master.test
+share/mysql-test/suite/funcs_2/data/charset_utf8.txt
+share/mysql-test/suite/funcs_2/include/check_charset.inc
+share/mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
+share/mysql-test/suite/funcs_2/include/check_charset_utf8.inc
+share/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
+share/mysql-test/suite/funcs_2/r/innodb_charset.result
+share/mysql-test/suite/funcs_2/r/memory_charset.result
+share/mysql-test/suite/funcs_2/r/myisam_charset.result
+share/mysql-test/suite/funcs_2/r/ndb_charset.result
+share/mysql-test/suite/funcs_2/readme.txt
+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/t/alias.test
 share/mysql-test/t/alter_table-big.test
 share/mysql-test/t/alter_table.test
@@ -736,6 +1050,7 @@ 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/bootstrap.test
 share/mysql-test/t/bulk_replace.test
 share/mysql-test/t/case.test
 share/mysql-test/t/cast.test
@@ -896,6 +1211,7 @@ 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-ucs2.test
 share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
@@ -966,6 +1282,8 @@ share/mysql-test/t/mysql_delimiter_source.sql
 share/mysql-test/t/mysql_protocols.test
 share/mysql-test/t/mysql_upgrade.test
 share/mysql-test/t/mysqladmin.test
+share/mysql-test/t/mysqlbinlog-cp932-master.opt
+share/mysql-test/t/mysqlbinlog-cp932.test
 share/mysql-test/t/mysqlbinlog-master.opt
 share/mysql-test/t/mysqlbinlog.test
 share/mysql-test/t/mysqlbinlog2.test
@@ -1006,6 +1324,8 @@ 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_print.test
+share/mysql-test/t/ndb_single_user.test
 share/mysql-test/t/ndb_subquery.test
 share/mysql-test/t/ndb_transaction.test
 share/mysql-test/t/ndb_trigger.test
@@ -1126,12 +1446,16 @@ share/mysql-test/t/rpl_ignore_table.test
 share/mysql-test/t/rpl_init_slave-slave.opt
 share/mysql-test/t/rpl_init_slave.test
 share/mysql-test/t/rpl_innodb.test
+share/mysql-test/t/rpl_insert_delayed.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_known_bugs_detection-master.opt
+share/mysql-test/t/rpl_known_bugs_detection.test
 share/mysql-test/t/rpl_loaddata.test
+share/mysql-test/t/rpl_loaddata_charset.test
 share/mysql-test/t/rpl_loaddata_rule_m-master.opt
 share/mysql-test/t/rpl_loaddata_rule_m.test
 share/mysql-test/t/rpl_loaddata_rule_s-slave.opt
@@ -1197,6 +1521,7 @@ 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_ssl.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
@@ -1228,6 +1553,7 @@ share/mysql-test/t/sp-error.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-ucs2.test
 share/mysql-test/t/sp-vars.test
 share/mysql-test/t/sp.test
 share/mysql-test/t/sp_notembedded.test
@@ -1237,8 +1563,6 @@ share/mysql-test/t/sql_mode.test
 share/mysql-test/t/ssl.test
 share/mysql-test/t/ssl_compress.test
 share/mysql-test/t/ssl_connect.test
-share/mysql-test/t/ssl_des-master.opt
-share/mysql-test/t/ssl_des.test
 share/mysql-test/t/status.test
 share/mysql-test/t/strict.test
 share/mysql-test/t/strict_autoinc_1myisam.test
@@ -1398,6 +1722,30 @@ 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/funcs_2/t
+@dirrm share/mysql-test/suite/funcs_2/r
+@dirrm share/mysql-test/suite/funcs_2/lib
+@dirrm share/mysql-test/suite/funcs_2/include
+@dirrm share/mysql-test/suite/funcs_2/data
+@dirrm share/mysql-test/suite/funcs_2/charset
+@dirrm share/mysql-test/suite/funcs_2
+@dirrm share/mysql-test/suite/funcs_1/views
+@dirrm share/mysql-test/suite/funcs_1/triggers
+@dirrm share/mysql-test/suite/funcs_1/t
+@dirrm share/mysql-test/suite/funcs_1/storedproc
+@dirrm share/mysql-test/suite/funcs_1/r
+@dirrm share/mysql-test/suite/funcs_1/lib
+@dirrm share/mysql-test/suite/funcs_1/include
+@dirrm share/mysql-test/suite/funcs_1/datadict
+@dirrm share/mysql-test/suite/funcs_1/data
+@dirrm share/mysql-test/suite/funcs_1/cursors
+@dirrm share/mysql-test/suite/funcs_1/bitdata
+@dirrm share/mysql-test/suite/funcs_1
+@dirrm share/mysql-test/suite
 @dirrm share/mysql-test/std_data
 @dirrm share/mysql-test/r
 @dirrm share/mysql-test/lib
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 0865c72a7f0..df4a26f5599 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.14 2007/03/11 18:42:49 adam Exp $
+$NetBSD: distinfo,v 1.15 2007/05/21 04:40:00 xtraeme Exp $
 
-SHA1 (mysql-5.0.37.tar.gz) = 7c957d4337156c7f98b0617fd5a63f3a838a9bc4
-RMD160 (mysql-5.0.37.tar.gz) = 132d3886a81fcec9be50cdc8d97c868928f5424f
-Size (mysql-5.0.37.tar.gz) = 23239518 bytes
+SHA1 (mysql-5.0.41.tar.gz) = cc2a119c9e07173fce6d78fc87d96c6102eeab36
+RMD160 (mysql-5.0.41.tar.gz) = 57f2b5ac628814abd2b19a263cd2c90e3e20593d
+Size (mysql-5.0.41.tar.gz) = 24083795 bytes
 SHA1 (patch-aa) = 9dcc34093f425024755d32346524117d72f00943
 SHA1 (patch-ab) = d79d5eb4c9e8c939da4bf34e8d7f3f5a52e41a10
-SHA1 (patch-ac) = 22e2fe1a978eeeb03aa98afd24207c7719a6112c
+SHA1 (patch-ac) = 87c795d0728f221e8d37b0711131f072bbadf1f1
 SHA1 (patch-ad) = 2956a12d9a5a053fd5dd380f856475242e8c1199
 SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
 SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ag) = 7c12975196f504c76954bfe92ffff0a98ba63019
-SHA1 (patch-ah) = b7002140ed0ebc24e5df5f92b1c0ceaf8e2a6211
+SHA1 (patch-ah) = 39f417b0fbb3344792e69aa9f3bcd8950d41bc43
 SHA1 (patch-ai) = c8ba7dfe00f37682e3f521314fe4225aa0b8e4a3
 SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
-SHA1 (patch-ak) = 2930b7fae228e02de593dd8deb083d373ca75e5a
+SHA1 (patch-ak) = 9df4e5ba12598363e880f2270806aa5a468a0cee
 SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1
-SHA1 (patch-am) = 977d37ec5eba241bbad61481143de59e49b7892e
-SHA1 (patch-an) = ec63621ba908b9da9e1d6dacba9a7894c21e9f5b
+SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
+SHA1 (patch-an) = cfba5c557e555c5e7b29491a0383ca290dfb45fa
 SHA1 (patch-ao) = 235f7d6bfdf609abf14441b1432b00dc5744fed8
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac
index c8da422b493..3c59c59b352 100644
--- a/databases/mysql5-server/patches/patch-ac
+++ b/databases/mysql5-server/patches/patch-ac
@@ -1,31 +1,22 @@
-$NetBSD: patch-ac,v 1.5 2007/03/11 18:42:49 adam Exp $
+$NetBSD: patch-ac,v 1.6 2007/05/21 04:40:00 xtraeme Exp $
 
---- mysql-test/Makefile.in.orig	2007-03-05 20:22:56.000000000 +0100
-+++ mysql-test/Makefile.in
-@@ -374,7 +374,7 @@ zlib_dir = @zlib_dir@
- @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-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
- EXTRA_DIST = $(EXTRA_SCRIPTS)
- GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr
-@@ -770,12 +770,11 @@ dist-hook:
- 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
- 
- install-data-local:
--	$(mkinstalldirs) \
--		$(DESTDIR)$(testdir)/t \
--		$(DESTDIR)$(testdir)/r \
--		$(DESTDIR)$(testdir)/include \
--		$(DESTDIR)$(testdir)/std_data \
--		$(DESTDIR)$(testdir)/lib
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/t
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/r
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/include
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data
-+	$(mkinstalldirs) $(DESTDIR)$(testdir)/lib
- 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
- 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
- 	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
+--- configure.in.orig	2007-05-21 05:53:04.000000000 +0200
++++ configure.in	2007-05-21 05:53:27.000000000 +0200
+@@ -487,7 +487,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*)
+@@ -1121,7 +1121,7 @@
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
+-  *freebsd*)
++  *freebsd*|*dragonfly*)
+     AC_MSG_WARN([Adding fix for interrupted reads])
+     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
+     if test "$OSVERSION" -gt "480100" && \
diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah
index 8a05691d7a6..cf638d28c8b 100644
--- a/databases/mysql5-server/patches/patch-ah
+++ b/databases/mysql5-server/patches/patch-ah
@@ -1,19 +1,19 @@
-$NetBSD: patch-ah,v 1.4 2007/03/11 18:42:49 adam Exp $
+$NetBSD: patch-ah,v 1.5 2007/05/21 04:40:01 xtraeme Exp $
 
---- include/Makefile.in.orig	2007-03-05 20:22:51.000000000 +0100
-+++ include/Makefile.in
-@@ -362,13 +362,7 @@ HEADERS_GEN = mysql_version.h my_config.
+--- include/Makefile.in.orig	2007-05-21 06:03:49.000000000 +0200
++++ include/Makefile.in	2007-05-21 06:04:11.000000000 +0200
+@@ -362,13 +362,7 @@
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
  			my_list.h my_alloc.h typelib.h
  
 -pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
 -			my_xml.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_pthread.h my_no_pthread.h raid.h \
+-			decimal.h errmsg.h my_global.h my_net.h \
 -			my_getopt.h sslopt-longopts.h my_dir.h \
 -			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
 -			m_ctype.h $(HEADERS_GEN)
-+pkginclude_HEADERS =
++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-ak b/databases/mysql5-server/patches/patch-ak
index 4a21ef03772..b493466a112 100644
--- a/databases/mysql5-server/patches/patch-ak
+++ b/databases/mysql5-server/patches/patch-ak
@@ -1,9 +1,9 @@
-$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:50 adam Exp $
+$NetBSD: patch-ak,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
 
---- support-files/Makefile.in.orig	2007-03-05 20:23:22.000000000 +0100
-+++ support-files/Makefile.in
-@@ -379,14 +379,7 @@ EXTRA_DIST = mysql.spec.sh \
- 			ndb-config-2-node.ini.sh
+--- 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 @@
+ 			compiler_warnings.supp
  
  SUBDIRS = MacOSX RHEL4-SElinux
 -pkgdata_DATA = my-small.cnf \
diff --git a/databases/mysql5-server/patches/patch-am b/databases/mysql5-server/patches/patch-am
index 9c4b08489cd..2c86e98bf1a 100644
--- a/databases/mysql5-server/patches/patch-am
+++ b/databases/mysql5-server/patches/patch-am
@@ -1,15 +1,16 @@
-$NetBSD: patch-am,v 1.2 2007/03/11 18:42:50 adam Exp $
+$NetBSD: patch-am,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
 
---- extra/Makefile.in.orig	2007-03-05 20:22:41.000000000 +0100
-+++ extra/Makefile.in
-@@ -434,9 +434,7 @@ INCLUDES = -I$(top_builddir)/include -I$
- LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
- 			../dbug/libdbug.a ../strings/libmystrings.a
+--- extra/Makefile.in.orig	2007-05-21 06:05:42.000000000 +0200
++++ extra/Makefile.in	2007-05-21 06:05:59.000000000 +0200
+@@ -437,10 +437,7 @@
+ 			../dbug/libdbug.a ../strings/libmystrings.a \
+ 			$(ZLIB_LIBS)
  
 -BUILT_SOURCES = $(top_builddir)/include/mysqld_error.h \
 -                        $(top_builddir)/include/sql_state.h \
 -                        $(top_builddir)/include/mysqld_ername.h
+-
 +BUILT_SOURCES =
- 
  pkginclude_HEADERS = $(BUILT_SOURCES)
  DISTCLEANFILES = $(BUILT_SOURCES)
+ # We never use SUBDIRS here, but needed for automake 1.6.3
diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an
index 9c7a7dd1772..163359622ac 100644
--- a/databases/mysql5-server/patches/patch-an
+++ b/databases/mysql5-server/patches/patch-an
@@ -1,31 +1,31 @@
-$NetBSD: patch-an,v 1.2 2007/03/11 18:42:50 adam Exp $
+$NetBSD: patch-an,v 1.3 2007/05/21 04:40:01 xtraeme Exp $
 
---- configure.in.orig	2007-03-05 20:21:13.000000000 +0100
-+++ configure.in
-@@ -487,7 +487,7 @@ then
-   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*)
-@@ -794,6 +794,8 @@ AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(H
+--- 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 @@
+ @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-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 @@
+ 	-rm -rf `find $(distdir)/suite -type d -name SCCS`
  
- # For sem_xxx functions on Solaris 2.6
- AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-+# For sem_xxx functions on NetBSD
-+AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(rt, sem_init))
- MYSQL_CHECK_ZLIB_WITH_COMPRESS
- 
- # For large pages support
-@@ -1119,7 +1121,7 @@ case $SYSTEM_TYPE in
-       MAX_C_OPTIMIZE="-O"
-     fi
-     ;;
--  *freebsd*)
-+  *freebsd*|*dragonfly*)
-     AC_MSG_WARN([Adding fix for interrupted reads])
-     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
-     if test "$OSVERSION" -gt "480100" && \
+ install-data-local:
+-	$(mkinstalldirs) \
+-		$(DESTDIR)$(testdir)/t \
+-		$(DESTDIR)$(testdir)/r \
+-		$(DESTDIR)$(testdir)/include \
+-		$(DESTDIR)$(testdir)/std_data \
+-		$(DESTDIR)$(testdir)/lib
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/t
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/r
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/include
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/std_data
++	$(mkinstalldirs) $(DESTDIR)$(testdir)/lib
+ 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
+ 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
+ 	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t