Pullup ticket 2146 - requested by tron

security update for mysql5

- pkgsrc/databases/mysql5-client/Makefile.common	1.25
- pkgsrc/databases/mysql5-client/PLIST			1.7
- pkgsrc/databases/mysql5-client/distinfo		1.19
- pkgsrc/databases/mysql5-client/patches/patch-ac	removed
- pkgsrc/databases/mysql5-client/patches/patch-ad	1.6
- pkgsrc/databases/mysql5-client/patches/patch-ae	1.9
- pkgsrc/databases/mysql5-client/patches/patch-bg	removed
- pkgsrc/databases/mysql5-server/PLIST			1.11
- pkgsrc/databases/mysql5-server/distinfo		1.16
- pkgsrc/databases/mysql5-server/patches/patch-aa	1.5
- pkgsrc/databases/mysql5-server/patches/patch-ac	removed
- pkgsrc/databases/mysql5-server/patches/patch-ah	1.6
- pkgsrc/databases/mysql5-server/patches/patch-ao	removed

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Jul 15 19:22:07 UTC 2007

   Modified Files:
	   pkgsrc/databases/mysql5-client: Makefile.common PLIST distinfo
	   pkgsrc/databases/mysql5-client/patches: patch-ad patch-ae
	   pkgsrc/databases/mysql5-server: PLIST distinfo
	   pkgsrc/databases/mysql5-server/patches: patch-aa patch-ah
   Removed Files:
	   pkgsrc/databases/mysql5-client/patches: patch-ac patch-bg
	   pkgsrc/databases/mysql5-server/patches: patch-ac patch-ao

   Log Message:
   Update "mysql5-client" and "mysql5-server" packages to version 5.0.45.
   Change since version 5.0.41:
   - Functionality added or changed:
     - A new status variable, Com_call_procedure, indicates the number of calls
       to stored procedures. (Bug#27994)
     - NDB Cluster: The server source tree now includes scripts to simplify
       building MySQL with SCI support. For more information about SCI
       interconnects and these build scripts, see Section 15.9.1,
       Configuring MySQL Cluster to use SCI Sockets. (Bug#25470)
     - Prior to this release, when DATE values were compared with DATETIME values
       the time portion of the DATETIME value was ignored. Now a DATE value is
       coerced to the DATETIME type by adding the time portion as 00:00:00. To
       mimic the old behavior use the CAST() function in the following way:
       SELECT date_field = CAST(NOW() as DATE);. (Bug#28929)
   - A large number of bugs including these security problems have been fixed:
     - A malformed password packet in the
       connection protocol could cause the server to crash. Thanks for Dormando
       for reporting this bug and providing details and a proof of concept.
       (Bug#28984)
     - CREATE TABLE LIKE did not require any privileges on the source table. Now
       it requires the SELECT privilege. (Bug#25578)
     - In addition, CREATE TABLE LIKE was not isolated from alteration by other
       connections, which resulted in various errors and incorrect binary log
       order when trying to execute concurrently a CREATE TABLE LIKE statement
       and either DDL statements on the source table or DML or DDL statements on
       the target table. (Bug#23667)

13 files changed, 72 insertions, 127 deletions

diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 0a548f80489..0d9ebf0ecfe 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.21 2007/05/21 04:39:59 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.21.2.1 2007/07/28 16:46:36 ghen Exp $
 
-DISTNAME=		mysql-5.0.41
+DISTNAME=		mysql-5.0.45
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
index 94617b60d49..b2f58cee4e3 100644
--- a/databases/mysql5-client/PLIST
+++ b/databases/mysql5-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/05/21 04:39:59 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2007/07/28 16:46:37 ghen Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -31,6 +31,7 @@ include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
+include/mysql/my_attribute.h
 include/mysql/my_config.h
 include/mysql/my_dbug.h
 include/mysql/my_dir.h
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index c7c1e9d5902..5f5dd1a3f73 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.18 2007/05/21 04:39:59 xtraeme Exp $
+$NetBSD: distinfo,v 1.18.2.1 2007/07/28 16:46:37 ghen Exp $
 
-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 (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 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
-SHA1 (patch-ac) = 87c795d0728f221e8d37b0711131f072bbadf1f1
-SHA1 (patch-ad) = e8e04a6beca500a0fd96b95b19fac13d7a662500
-SHA1 (patch-ae) = 4403c09d89cdb1f72275551aa17e1b4e04bb1ad9
+SHA1 (patch-ad) = 716c02583e87c99e69ebe00c64d4a4371487a666
+SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da
 SHA1 (patch-af) = 06cb76ad50ed0de3e82f682bf57a75441f68da26
 SHA1 (patch-ag) = 212f9c0a2e2eb6feb013e4a72eaf658951b995b5
 SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
@@ -24,5 +23,4 @@ SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
 SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
 SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
-SHA1 (patch-bg) = 32e63926587f59203eb4094139c3e0938a0bc877
 SHA1 (patch-bh) = 61ae8ad98f683418615a96f0dabb286a71642760
diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
deleted file mode 100644
index f73b5afded7..00000000000
--- a/databases/mysql5-client/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/05/21 04:39:59 xtraeme Exp $
-
---- 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-client/patches/patch-ad b/databases/mysql5-client/patches/patch-ad
index ac95931cbbe..6fb71429b84 100644
--- a/databases/mysql5-client/patches/patch-ad
+++ b/databases/mysql5-client/patches/patch-ad
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.5 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ad,v 1.5.4.1 2007/07/28 16:46:38 ghen Exp $
 
---- Makefile.in.orig	2007-03-05 20:23:25.000000000 +0100
-+++ Makefile.in
-@@ -372,12 +372,7 @@ AUTOMAKE_OPTIONS = foreign
+--- Makefile.in.orig	2007-07-04 14:10:07.000000000 +0100
++++ Makefile.in	2007-07-15 17:20:48.000000000 +0100
+@@ -374,12 +374,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
--			@readline_topdir@ sql-common \
+-			@readline_topdir@ sql-common scripts \
 -			@thread_dirs@ pstack \
--			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			@sql_union_dirs@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @tools_dirs@
 +SUBDIRS = . include strings @sql_client_dirs@ scripts man
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 3fec5c23a33..09187fcf0ed 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.8 2007/05/21 04:40:00 xtraeme Exp $
+$NetBSD: patch-ae,v 1.8.2.1 2007/07/28 16:46:38 ghen Exp $
 
---- scripts/Makefile.in.orig	2007-05-21 04:54:42.000000000 +0200
-+++ scripts/Makefile.in	2007-05-21 04:55:14.000000000 +0200
-@@ -355,13 +355,12 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
+--- scripts/Makefile.in.orig	2007-07-04 14:10:00.000000000 +0100
++++ scripts/Makefile.in	2007-07-15 17:24:02.000000000 +0100
+@@ -377,13 +377,12 @@
+ BUILT_SOURCES = mysql_fix_privilege_tables.sql \
+ 		mysql_fix_privilege_tables_sql.c
+ 
 -bin_SCRIPTS = @server_scripts@ \
-+bin_SCRIPTS =  \
++bin_SCRIPTS = \
  			msql2mysql \
  			mysql_config \
  			mysql_fix_privilege_tables \
@@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.8 2007/05/21 04:40:00 xtraeme Exp $
  			mysql_zap \
  			mysqlaccess \
  			mysqlbug \
-@@ -372,7 +371,6 @@
+@@ -394,7 +393,6 @@
  			mysql_explain_log \
  			mysql_tableinfo \
  			mysql_upgrade_shell \
diff --git a/databases/mysql5-client/patches/patch-bg b/databases/mysql5-client/patches/patch-bg
deleted file mode 100644
index ebe45e9ebb2..00000000000
--- a/databases/mysql5-client/patches/patch-bg
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2007/05/21 04:40:00 xtraeme Exp $
-
-
---- sql/sql_parse.cc.orig	2007-05-21 04:56:56.000000000 +0200
-+++ sql/sql_parse.cc	2007-05-21 04:59:31.000000000 +0200
-@@ -3304,7 +3304,7 @@
- 	*/
- 	old_list= table[0];
- 	new_list= table->next_local[0];
--	if (check_grant(thd, ALTER_ACL, &old_list, 0, 1, 0) ||
-+	if (check_grant(thd, ALTER_ACL | DROP_ACL, &old_list, 0, 1, 0) ||
- 	    (!test_all_bits(table->next_local->grant.privilege,
- 			    INSERT_ACL | CREATE_ACL) &&
- 	     check_grant(thd, INSERT_ACL | CREATE_ACL, &new_list, 0, 1, 0)))
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index c0fbc62a64d..0301df3384e 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/05/21 04:40:00 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10.2.1 2007/07/28 16:46:38 ghen Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -69,7 +69,9 @@ share/mysql-test/include/have_gbk.inc
 share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_innodb.inc
 share/mysql-test/include/have_latin2_ch.inc
+share/mysql-test/include/have_log_bin.inc
 share/mysql-test/include/have_lowercase0.inc
+share/mysql-test/include/have_lowercase1.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
 share/mysql-test/include/have_outfile.inc
@@ -82,7 +84,6 @@ share/mysql-test/include/have_udf.inc
 share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/im_check_env.inc
 share/mysql-test/include/innodb_rollback_on_timeout.inc
-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
@@ -101,6 +102,7 @@ share/mysql-test/include/ps_query.inc
 share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/report-features.test
 share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/show_binlog_events.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
 share/mysql-test/include/sp-vars.inc
@@ -108,8 +110,13 @@ share/mysql-test/include/strict_autoinc.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/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_sql_to_stop.inc
+share/mysql-test/include/wait_for_slave_to_start.inc
+share/mysql-test/include/wait_for_slave_to_stop.inc
 share/mysql-test/include/wait_show_pattern.inc
 share/mysql-test/include/wait_slave_status.inc
 share/mysql-test/include/windows.inc
@@ -154,6 +161,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_killed.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
 share/mysql-test/r/bootstrap.result
@@ -183,7 +191,6 @@ share/mysql-test/r/ctype_cp1250_ch.result
 share/mysql-test/r/ctype_cp1251.result
 share/mysql-test/r/ctype_cp932.result
 share/mysql-test/r/ctype_cp932_binlog.result
-share/mysql-test/r/ctype_cp932_notembedded.result
 share/mysql-test/r/ctype_create.result
 share/mysql-test/r/ctype_eucjpms.result
 share/mysql-test/r/ctype_euckr.result
@@ -216,6 +223,7 @@ 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/error_simulation.result
 share/mysql-test/r/errors.result
 share/mysql-test/r/exampledb.result
 share/mysql-test/r/execution_constants.result
@@ -224,7 +232,6 @@ 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/fix_priv_tables.result
-share/mysql-test/r/fix_priv_tabs.result
 share/mysql-test/r/flush.result
 share/mysql-test/r/flush2.result
 share/mysql-test/r/flush_block_commit.result
@@ -297,6 +304,7 @@ share/mysql-test/r/have_gbk.require
 share/mysql-test/r/have_geometry.require
 share/mysql-test/r/have_innodb.require
 share/mysql-test/r/have_latin2_ch.require
+share/mysql-test/r/have_log_bin.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_mysql_upgrade.result
@@ -374,9 +382,12 @@ share/mysql-test/r/loaddata_autocom_ndb.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/long_tmpdir.result
 share/mysql-test/r/lowercase0.require
+share/mysql-test/r/lowercase1.require
 share/mysql-test/r/lowercase2.require
 share/mysql-test/r/lowercase_fs_off.result
+share/mysql-test/r/lowercase_mixed_tmpdir.result
 share/mysql-test/r/lowercase_table.result
 share/mysql-test/r/lowercase_table2.result
 share/mysql-test/r/lowercase_table3.result
@@ -510,6 +521,7 @@ share/mysql-test/r/rpl_charset.result
 share/mysql-test/r/rpl_charset_sjis.result
 share/mysql-test/r/rpl_commit_after_flush.result
 share/mysql-test/r/rpl_create_database.result
+share/mysql-test/r/rpl_critical_errors.result
 share/mysql-test/r/rpl_ddl.result
 share/mysql-test/r/rpl_deadlock.result
 share/mysql-test/r/rpl_delete_all.result
@@ -611,6 +623,7 @@ share/mysql-test/r/sp.result
 share/mysql-test/r/sp_notembedded.result
 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.result
 share/mysql-test/r/ssl_compress.result
@@ -675,6 +688,7 @@ 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-big.result
 share/mysql-test/r/variables.result
 share/mysql-test/r/view.result
 share/mysql-test/r/view_grant.result
@@ -772,7 +786,6 @@ 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
@@ -794,7 +807,6 @@ 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
@@ -815,7 +827,6 @@ 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
@@ -836,7 +847,6 @@ 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
@@ -847,7 +857,6 @@ 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
@@ -1048,6 +1057,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_killed.test
 share/mysql-test/t/blackhole.test
 share/mysql-test/t/bool.test
 share/mysql-test/t/bootstrap.test
@@ -1076,7 +1086,6 @@ share/mysql-test/t/ctype_cp1250_ch.test
 share/mysql-test/t/ctype_cp1251.test
 share/mysql-test/t/ctype_cp932.test
 share/mysql-test/t/ctype_cp932_binlog.test
-share/mysql-test/t/ctype_cp932_notembedded.test
 share/mysql-test/t/ctype_create.test
 share/mysql-test/t/ctype_eucjpms.test
 share/mysql-test/t/ctype_euckr.test
@@ -1113,6 +1122,8 @@ 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/error_simulation-master.opt
+share/mysql-test/t/error_simulation.test
 share/mysql-test/t/errors.test
 share/mysql-test/t/exampledb.test
 share/mysql-test/t/execution_constants.test
@@ -1250,7 +1261,13 @@ 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/log.sh
+share/mysql-test/t/long_tmpdir-master.opt
+share/mysql-test/t/long_tmpdir-master.sh
+share/mysql-test/t/long_tmpdir.test
 share/mysql-test/t/lowercase_fs_off.test
+share/mysql-test/t/lowercase_mixed_tmpdir-master.opt
+share/mysql-test/t/lowercase_mixed_tmpdir-master.sh
+share/mysql-test/t/lowercase_mixed_tmpdir.test
 share/mysql-test/t/lowercase_table-master.opt
 share/mysql-test/t/lowercase_table.test
 share/mysql-test/t/lowercase_table2.test
@@ -1411,6 +1428,7 @@ 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_critical_errors.test
 share/mysql-test/t/rpl_ddl.test
 share/mysql-test/t/rpl_deadlock-slave.opt
 share/mysql-test/t/rpl_deadlock.test
@@ -1559,6 +1577,7 @@ share/mysql-test/t/sp.test
 share/mysql-test/t/sp_notembedded.test
 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.test
 share/mysql-test/t/ssl_compress.test
@@ -1632,6 +1651,7 @@ share/mysql-test/t/user_var-binlog.test
 share/mysql-test/t/user_var.test
 share/mysql-test/t/utils.sh
 share/mysql-test/t/varbinary.test
+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
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index df4a26f5599..03491684ced 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,21 +1,19 @@
-$NetBSD: distinfo,v 1.15 2007/05/21 04:40:00 xtraeme Exp $
+$NetBSD: distinfo,v 1.15.2.1 2007/07/28 16:46:39 ghen Exp $
 
-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 (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 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023
 SHA1 (patch-ab) = d79d5eb4c9e8c939da4bf34e8d7f3f5a52e41a10
-SHA1 (patch-ac) = 87c795d0728f221e8d37b0711131f072bbadf1f1
 SHA1 (patch-ad) = 2956a12d9a5a053fd5dd380f856475242e8c1199
 SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
 SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ag) = 7c12975196f504c76954bfe92ffff0a98ba63019
-SHA1 (patch-ah) = 39f417b0fbb3344792e69aa9f3bcd8950d41bc43
+SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597
 SHA1 (patch-ai) = c8ba7dfe00f37682e3f521314fe4225aa0b8e4a3
 SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
 SHA1 (patch-ak) = 9df4e5ba12598363e880f2270806aa5a468a0cee
 SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1
 SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
 SHA1 (patch-an) = cfba5c557e555c5e7b29491a0383ca290dfb45fa
-SHA1 (patch-ao) = 235f7d6bfdf609abf14441b1432b00dc5744fed8
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa
index 05504a2dc51..636f3dbed44 100644
--- a/databases/mysql5-server/patches/patch-aa
+++ b/databases/mysql5-server/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2007/03/11 18:42:49 adam Exp $
+$NetBSD: patch-aa,v 1.4.4.1 2007/07/28 16:46:39 ghen Exp $
 
---- Makefile.in.orig	2007-03-05 20:23:25.000000000 +0100
-+++ Makefile.in
-@@ -372,12 +372,8 @@ AUTOMAKE_OPTIONS = foreign
+--- Makefile.in.orig	2007-07-04 14:10:07.000000000 +0100
++++ Makefile.in	2007-07-15 18:10:44.000000000 +0100
+@@ -374,12 +374,8 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
--			@readline_topdir@ sql-common \
+-			@readline_topdir@ sql-common scripts \
 -			@thread_dirs@ pstack \
--			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			@sql_union_dirs@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @tools_dirs@
 +SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \
diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac
deleted file mode 100644
index 3c59c59b352..00000000000
--- a/databases/mysql5-server/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2007/05/21 04:40:00 xtraeme Exp $
-
---- 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 cf638d28c8b..c236f217194 100644
--- a/databases/mysql5-server/patches/patch-ah
+++ b/databases/mysql5-server/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2007/05/21 04:40:01 xtraeme Exp $
+$NetBSD: patch-ah,v 1.5.2.1 2007/07/28 16:46:40 ghen Exp $
 
---- 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 @@
+--- include/Makefile.in.orig	2007-07-04 14:09:35.000000000 +0100
++++ include/Makefile.in	2007-07-15 18:12:08.000000000 +0100
+@@ -364,13 +364,7 @@
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
  			my_list.h my_alloc.h typelib.h
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ah,v 1.5 2007/05/21 04:40:01 xtraeme Exp $
 -			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)
+-			m_ctype.h my_attribute.h $(HEADERS_GEN)
 +pkginclude_HEADERS = 
  
  noinst_HEADERS = config-win.h config-os2.h config-netware.h \
diff --git a/databases/mysql5-server/patches/patch-ao b/databases/mysql5-server/patches/patch-ao
deleted file mode 100644
index 0779dcec2e2..00000000000
--- a/databases/mysql5-server/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2007/03/11 18:42:50 adam Exp $
-
---- sql/sql_lex.cc.orig	2007-03-05 20:21:11.000000000 +0100
-+++ sql/sql_lex.cc
-@@ -931,6 +931,9 @@ int MYSQLlex(void *arg, void *yythd)
-       while (lex->ptr != lex->end_of_query &&
- 	     ((c=yyGet()) != '*' || yyPeek() != '/'))
-       {
-+	if (c == '\0')
-+	  return(ABORT_SYM);		// NULLs illegal even in comments
-+
- 	if (c == '\n')
- 	  lex->yylineno++;
-       }