Pullup ticket 1399 - requested by xtraeme

security update for mysql5

Revisions pulled up:
- pkgsrc/databases/mysql5-client/Makefile		1.7
- pkgsrc/databases/mysql5-client/Makefile.common	1.10
- pkgsrc/databases/mysql5-client/PLIST			1.4
- pkgsrc/databases/mysql5-client/distinfo		1.5
- pkgsrc/databases/mysql5-client/patches/patch-ae	1.4
- pkgsrc/databases/mysql5-server/PLIST			1.5
- pkgsrc/databases/mysql5-server/distinfo		1.5, 1.6
- pkgsrc/databases/mysql5-server/patches/patch-ao	1.1

   Module Name:		pkgsrc
   Committed By:	xtraeme
   Date:		Thu Apr 13 11:19:25 UTC 2006

   Modified Files:
   	pkgsrc/databases/mysql5-client: Makefile Makefile.common PLIST
		distinfo
   	pkgsrc/databases/mysql5-client/patches: patch-ae
   	pkgsrc/databases/mysql5-server: PLIST distinfo

   Log Message:
   Update mysql5-* to 5.0.20.

   To see new changes and bugs fixed, see:
   http://dev.mysql.com/doc/refman/5.0/en/news-5-0-x.html.
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Mon Apr 17 11:21:41 UTC 2006

   Modified Files:
   	pkgsrc/databases/mysql5-server: distinfo
   Added Files:
   	pkgsrc/databases/mysql5-server/patches: patch-ao

   Log Message:
   Add fix for CAN-2006-0903 taken from MySQL bug #17667. Bump package
   revision because of this security fix.

8 files changed, 105 insertions, 37 deletions

diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index c8fd5bc4ca0..0b5f54920d5 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
+#PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 1f0f29d7f60..0095a3e7c5b 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.7 2006/03/03 04:00:09 grant Exp $
+# $NetBSD: Makefile.common,v 1.7.2.1 2006/04/17 21:58:38 salo Exp $
 
-DISTNAME=		mysql-5.0.18
+DISTNAME=		mysql-5.0.20
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
index 8eff0a1f6a5..9f64733a397 100644
--- a/databases/mysql5-client/PLIST
+++ b/databases/mysql5-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/08 17:45:23 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2006/04/17 21:58:38 salo Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -6,9 +6,11 @@ bin/mysql_convert_table_format
 bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
+bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
 bin/mysql_setpermission
 bin/mysql_tableinfo
+bin/mysql_upgrade
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index 62927961edf..90bd7760600 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: distinfo,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
 
-SHA1 (mysql-5.0.18.tar.gz) = e102a5086455c0f80a830e5dfc65acccc5e19a60
-RMD160 (mysql-5.0.18.tar.gz) = 1987df6d9446637c8e353f61e269e9a57d995803
-Size (mysql-5.0.18.tar.gz) = 19169082 bytes
+SHA1 (mysql-5.0.20.tar.gz) = b66fd7821d6cb5f3150f703e90d64697a770a165
+RMD160 (mysql-5.0.20.tar.gz) = f7daabd98124b88c021b314ac23c25d09597e573
+Size (mysql-5.0.20.tar.gz) = 19445124 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
 SHA1 (patch-ad) = 81c48274e3a43e46cf9d53f9ed4620c02761902a
-SHA1 (patch-ae) = fa70584c1846c81fe72a7796b1f7f237b398bc30
+SHA1 (patch-ae) = 3fe37b158abdd892f077c805ce3eb4ba19dc4594
 SHA1 (patch-af) = 61f9cfd169e630708809142694d2bbea0055d20d
 SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index b97f05128fb..31bfc1184cc 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,32 +1,29 @@
-$NetBSD: patch-ae,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3.2.1 2006/04/17 21:58:38 salo Exp $
 
---- scripts/Makefile.in.orig	2006-01-09 15:54:43.000000000 +0100
-+++ scripts/Makefile.in	2006-01-09 15:55:14.000000000 +0100
-@@ -341,23 +341,10 @@
+Don't install scripts handled by mysql-server.
+
+--- scripts/Makefile.in.orig	2006-04-13 11:58:39.000000000 +0200
++++ scripts/Makefile.in	2006-04-13 12:00:06.000000000 +0200
+@@ -344,13 +344,12 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
--			msql2mysql \
--			mysql_config \
--			mysql_fix_privilege_tables \
--			mysql_fix_extensions \
--			mysql_setpermission \
++bin_SCRIPTS = \
+ 			msql2mysql \
+ 			mysql_config \
+ 			mysql_fix_privilege_tables \
+ 			mysql_fix_extensions \
+ 			mysql_setpermission \
 -			mysql_secure_installation \
--			mysql_zap \
--			mysqlaccess \
--			mysqlbug \
--			mysql_convert_table_format \
--			mysql_find_rows \
--			mysqlhotcopy \
--			mysqldumpslow \
--			mysql_explain_log \
--			mysql_tableinfo \
+ 			mysql_zap \
+ 			mysqlaccess \
+ 			mysqlbug \
+@@ -361,7 +360,6 @@
+ 			mysql_explain_log \
+ 			mysql_tableinfo \
+ 			mysql_upgrade \
 -			mysqld_multi \
-+bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
-+	mysql_setpermission mysql_zap mysqlaccess mysqlbug \
-+	mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-+	mysqldumpslow mysql_explain_log mysql_tableinfo \
  			mysql_create_system_tables
  
  noinst_SCRIPTS = make_binary_distribution \
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index 18d448a8698..bb34c578bc7 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -54,11 +54,14 @@ share/mysql-test/include/have_crypt.inc
 share/mysql-test/include/have_csv.inc
 share/mysql-test/include/have_debug.inc
 share/mysql-test/include/have_eucjpms.inc
+share/mysql-test/include/have_euckr.inc
 share/mysql-test/include/have_exampledb.inc
 share/mysql-test/include/have_federated_db.inc
+share/mysql-test/include/have_gb2312.inc
 share/mysql-test/include/have_gbk.inc
 share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_innodb.inc
+share/mysql-test/include/have_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
@@ -68,6 +71,7 @@ share/mysql-test/include/have_query_cache.inc
 share/mysql-test/include/have_sjis.inc
 share/mysql-test/include/have_tis620.inc
 share/mysql-test/include/have_ucs2.inc
+share/mysql-test/include/have_udf.inc
 share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/im_check_os.inc
 share/mysql-test/include/is_debug_build.inc
@@ -87,11 +91,14 @@ share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/rpl_stmt_seq.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
+share/mysql-test/include/sourced.inc
+share/mysql-test/include/sourced1.inc
 share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
 share/mysql-test/include/testdb_only.inc
 share/mysql-test/include/varchar.inc
+share/mysql-test/include/wait_slave_status.inc
 share/mysql-test/include/windows.inc
 share/mysql-test/install_test_db
 share/mysql-test/lib/init_db.sql
@@ -154,12 +161,16 @@ 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
+share/mysql-test/r/ctype_gb2312.result
 share/mysql-test/r/ctype_gbk.result
 share/mysql-test/r/ctype_latin1.result
 share/mysql-test/r/ctype_latin1_de.result
 share/mysql-test/r/ctype_latin2.result
+share/mysql-test/r/ctype_latin2_ch.result
 share/mysql-test/r/ctype_many.result
 share/mysql-test/r/ctype_mb.result
 share/mysql-test/r/ctype_recoding.result
@@ -167,6 +178,7 @@ share/mysql-test/r/ctype_sjis.result
 share/mysql-test/r/ctype_tis620.result
 share/mysql-test/r/ctype_uca.result
 share/mysql-test/r/ctype_ucs.result
+share/mysql-test/r/ctype_ucs2_def.result
 share/mysql-test/r/ctype_ucs_binlog.result
 share/mysql-test/r/ctype_ujis.result
 share/mysql-test/r/ctype_utf8.result
@@ -249,11 +261,14 @@ share/mysql-test/r/have_crypt.require
 share/mysql-test/r/have_csv.require
 share/mysql-test/r/have_debug.require
 share/mysql-test/r/have_eucjpms.require
+share/mysql-test/r/have_euckr.require
 share/mysql-test/r/have_exampledb.require
 share/mysql-test/r/have_federated_db.require
+share/mysql-test/r/have_gb2312.require
 share/mysql-test/r/have_gbk.require
 share/mysql-test/r/have_geometry.require
 share/mysql-test/r/have_innodb.require
+share/mysql-test/r/have_latin2_ch.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_ndb.require
@@ -265,6 +280,7 @@ share/mysql-test/r/have_sjis.require
 share/mysql-test/r/have_symlink.require
 share/mysql-test/r/have_tis620.require
 share/mysql-test/r/have_ucs2.require
+share/mysql-test/r/have_udf.require
 share/mysql-test/r/have_ujis.require
 share/mysql-test/r/having.result
 share/mysql-test/r/heap.result
@@ -287,6 +303,7 @@ share/mysql-test/r/information_schema.result
 share/mysql-test/r/information_schema_db.result
 share/mysql-test/r/information_schema_inno.result
 share/mysql-test/r/init_connect.result
+share/mysql-test/r/init_file.result
 share/mysql-test/r/innodb-big.result
 share/mysql-test/r/innodb-deadlock.result
 share/mysql-test/r/innodb-lock.result
@@ -295,6 +312,8 @@ share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
+share/mysql-test/r/innodb_notembedded.result
+share/mysql-test/r/innodb_unsafe_binlog.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select-binlog.result
 share/mysql-test/r/insert_select.result
@@ -332,6 +351,7 @@ share/mysql-test/r/multi_update.result
 share/mysql-test/r/myisam-blob.result
 share/mysql-test/r/myisam.result
 share/mysql-test/r/mysql.result
+share/mysql-test/r/mysql_client_test.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
@@ -362,6 +382,7 @@ share/mysql-test/r/ndb_index_ordered.result
 share/mysql-test/r/ndb_index_unique.result
 share/mysql-test/r/ndb_insert.result
 share/mysql-test/r/ndb_limit.result
+share/mysql-test/r/ndb_load.result
 share/mysql-test/r/ndb_lock.result
 share/mysql-test/r/ndb_minmax.result
 share/mysql-test/r/ndb_multi.result
@@ -453,6 +474,8 @@ share/mysql-test/r/rpl_free_items.result
 share/mysql-test/r/rpl_get_lock.result
 share/mysql-test/r/rpl_heap.result
 share/mysql-test/r/rpl_ignore_grant.result
+share/mysql-test/r/rpl_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_id.result
@@ -474,6 +497,7 @@ share/mysql-test/r/rpl_multi_query.result
 share/mysql-test/r/rpl_multi_update.result
 share/mysql-test/r/rpl_multi_update2.result
 share/mysql-test/r/rpl_multi_update3.result
+share/mysql-test/r/rpl_multi_update4.result
 share/mysql-test/r/rpl_mystery22.result
 share/mysql-test/r/rpl_openssl.result
 share/mysql-test/r/rpl_optimize.result
@@ -498,6 +522,7 @@ share/mysql-test/r/rpl_start_stop_slave.result
 share/mysql-test/r/rpl_temporary.result
 share/mysql-test/r/rpl_timezone.result
 share/mysql-test/r/rpl_trigger.result
+share/mysql-test/r/rpl_trunc_temp.result
 share/mysql-test/r/rpl_until.result
 share/mysql-test/r/rpl_user_variables.result
 share/mysql-test/r/rpl_variables.result
@@ -524,6 +549,7 @@ share/mysql-test/r/sp-security.result
 share/mysql-test/r/sp-threads.result
 share/mysql-test/r/sp-vars.result
 share/mysql-test/r/sp.result
+share/mysql-test/r/sp_notembedded.result
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sql_mode.result
 share/mysql-test/r/ssl.result
@@ -534,10 +560,12 @@ share/mysql-test/r/subselect.result
 share/mysql-test/r/subselect2.result
 share/mysql-test/r/subselect_gis.result
 share/mysql-test/r/subselect_innodb.result
+share/mysql-test/r/subselect_notembedded.result
 share/mysql-test/r/sum_distinct-big.result
 share/mysql-test/r/sum_distinct.result
 share/mysql-test/r/symlink.result
 share/mysql-test/r/synchronization.result
+share/mysql-test/r/sysdate_is_now.result
 share/mysql-test/r/system_mysql_db.result
 share/mysql-test/r/system_mysql_db_refs.result
 share/mysql-test/r/tablelock.result
@@ -549,6 +577,7 @@ share/mysql-test/r/timezone3.result
 share/mysql-test/r/timezone_grant.result
 share/mysql-test/r/trigger-compat.result
 share/mysql-test/r/trigger-grant.result
+share/mysql-test/r/trigger-trans.result
 share/mysql-test/r/trigger.result
 share/mysql-test/r/true.require
 share/mysql-test/r/truncate.result
@@ -571,6 +600,7 @@ share/mysql-test/r/type_timestamp.result
 share/mysql-test/r/type_uint.result
 share/mysql-test/r/type_varchar.result
 share/mysql-test/r/type_year.result
+share/mysql-test/r/udf.result
 share/mysql-test/r/union.result
 share/mysql-test/r/update.result
 share/mysql-test/r/user_limits.result
@@ -588,6 +618,7 @@ share/mysql-test/r/xa.result
 share/mysql-test/server-cert.pem
 share/mysql-test/server-key.pem
 share/mysql-test/std_data/Moscow_leap
+share/mysql-test/std_data/bug16266.000001
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/client-cert.pem
 share/mysql-test/std_data/client-key.pem
@@ -662,13 +693,17 @@ 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
+share/mysql-test/t/ctype_gb2312.test
 share/mysql-test/t/ctype_gbk.test
 share/mysql-test/t/ctype_latin1.test
 share/mysql-test/t/ctype_latin1_de-master.opt
 share/mysql-test/t/ctype_latin1_de.test
 share/mysql-test/t/ctype_latin2.test
+share/mysql-test/t/ctype_latin2_ch.test
 share/mysql-test/t/ctype_many.test
 share/mysql-test/t/ctype_mb.test
 share/mysql-test/t/ctype_recoding.test
@@ -676,6 +711,8 @@ share/mysql-test/t/ctype_sjis.test
 share/mysql-test/t/ctype_tis620.test
 share/mysql-test/t/ctype_uca.test
 share/mysql-test/t/ctype_ucs.test
+share/mysql-test/t/ctype_ucs2_def-master.opt
+share/mysql-test/t/ctype_ucs2_def.test
 share/mysql-test/t/ctype_ucs_binlog.test
 share/mysql-test/t/ctype_ujis.test
 share/mysql-test/t/ctype_utf8.test
@@ -787,6 +824,9 @@ share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
 share/mysql-test/t/innodb_gis.test
 share/mysql-test/t/innodb_handler.test
+share/mysql-test/t/innodb_notembedded.test
+share/mysql-test/t/innodb_unsafe_binlog-master.opt
+share/mysql-test/t/innodb_unsafe_binlog.test
 share/mysql-test/t/insert.test
 share/mysql-test/t/insert_select-binlog.test
 share/mysql-test/t/insert_select.test
@@ -865,6 +905,7 @@ share/mysql-test/t/ndb_index_ordered.test
 share/mysql-test/t/ndb_index_unique.test
 share/mysql-test/t/ndb_insert.test
 share/mysql-test/t/ndb_limit.test
+share/mysql-test/t/ndb_load.test
 share/mysql-test/t/ndb_lock.test
 share/mysql-test/t/ndb_minmax.test
 share/mysql-test/t/ndb_multi.test
@@ -980,6 +1021,10 @@ share/mysql-test/t/rpl_get_lock.test
 share/mysql-test/t/rpl_heap.test
 share/mysql-test/t/rpl_ignore_grant-slave.opt
 share/mysql-test/t/rpl_ignore_grant.test
+share/mysql-test/t/rpl_ignore_revoke-slave.opt
+share/mysql-test/t/rpl_ignore_revoke.test
+share/mysql-test/t/rpl_ignore_table-slave.opt
+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
@@ -1012,6 +1057,8 @@ share/mysql-test/t/rpl_multi_update.test
 share/mysql-test/t/rpl_multi_update2-slave.opt
 share/mysql-test/t/rpl_multi_update2.test
 share/mysql-test/t/rpl_multi_update3.test
+share/mysql-test/t/rpl_multi_update4-slave.opt
+share/mysql-test/t/rpl_multi_update4.test
 share/mysql-test/t/rpl_mystery22.test
 share/mysql-test/t/rpl_openssl.test
 share/mysql-test/t/rpl_optimize.test
@@ -1052,6 +1099,7 @@ share/mysql-test/t/rpl_timezone-master.opt
 share/mysql-test/t/rpl_timezone-slave.opt
 share/mysql-test/t/rpl_timezone.test
 share/mysql-test/t/rpl_trigger.test
+share/mysql-test/t/rpl_trunc_temp.test
 share/mysql-test/t/rpl_until.test
 share/mysql-test/t/rpl_user_variables.test
 share/mysql-test/t/rpl_variables-master.opt
@@ -1077,6 +1125,7 @@ share/mysql-test/t/sp-security.test
 share/mysql-test/t/sp-threads.test
 share/mysql-test/t/sp-vars.test
 share/mysql-test/t/sp.test
+share/mysql-test/t/sp_notembedded.test
 share/mysql-test/t/sp_trans.test
 share/mysql-test/t/sql_mode.test
 share/mysql-test/t/ssl.test
@@ -1087,10 +1136,13 @@ share/mysql-test/t/subselect.test
 share/mysql-test/t/subselect2.test
 share/mysql-test/t/subselect_gis.test
 share/mysql-test/t/subselect_innodb.test
+share/mysql-test/t/subselect_notembedded.test
 share/mysql-test/t/sum_distinct-big.test
 share/mysql-test/t/sum_distinct.test
 share/mysql-test/t/symlink.test
 share/mysql-test/t/synchronization.test
+share/mysql-test/t/sysdate_is_now-master.opt
+share/mysql-test/t/sysdate_is_now.test
 share/mysql-test/t/system_mysql_db.test
 share/mysql-test/t/system_mysql_db_fix-master.opt
 share/mysql-test/t/system_mysql_db_fix.test
@@ -1106,6 +1158,7 @@ share/mysql-test/t/timezone3.test
 share/mysql-test/t/timezone_grant.test
 share/mysql-test/t/trigger-compat.test
 share/mysql-test/t/trigger-grant.test
+share/mysql-test/t/trigger-trans.test
 share/mysql-test/t/trigger.test
 share/mysql-test/t/truncate.test
 share/mysql-test/t/type_binary.test
@@ -1127,6 +1180,7 @@ share/mysql-test/t/type_timestamp.test
 share/mysql-test/t/type_uint.test
 share/mysql-test/t/type_varchar.test
 share/mysql-test/t/type_year.test
+share/mysql-test/t/udf.test
 share/mysql-test/t/union-master.opt
 share/mysql-test/t/union.test
 share/mysql-test/t/update.test
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index d75ebf5ca01..63873919f48 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: distinfo,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
 
-SHA1 (mysql-5.0.18.tar.gz) = e102a5086455c0f80a830e5dfc65acccc5e19a60
-RMD160 (mysql-5.0.18.tar.gz) = 1987df6d9446637c8e353f61e269e9a57d995803
-Size (mysql-5.0.18.tar.gz) = 19169082 bytes
+SHA1 (mysql-5.0.20.tar.gz) = b66fd7821d6cb5f3150f703e90d64697a770a165
+RMD160 (mysql-5.0.20.tar.gz) = f7daabd98124b88c021b314ac23c25d09597e573
+Size (mysql-5.0.20.tar.gz) = 19445124 bytes
 SHA1 (patch-aa) = fcd1222f9939070a45bbb8ddf72bb1bdadea1f8b
 SHA1 (patch-ab) = 56cd26b3eb125e7d9b7775c9e148118bbd3dc6b3
 SHA1 (patch-ac) = dd8cc3e1fdeba9ca2f6ab1e0a66be79877c43289
@@ -16,3 +16,4 @@ SHA1 (patch-aj) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
 SHA1 (patch-ak) = 516460b0aa9f641d74f83c5514f258a980033e41
 SHA1 (patch-al) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17
 SHA1 (patch-am) = 999bb2dbca518a7e19a96b53678de35c0b227434
+SHA1 (patch-ao) = c6c56cbff6fbb7ff809b9b544c28ea28fcd18517
diff --git a/databases/mysql5-server/patches/patch-ao b/databases/mysql5-server/patches/patch-ao
new file mode 100644
index 00000000000..eee41eee387
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.1.2.2 2006/04/17 21:58:38 salo Exp $
+
+--- sql/sql_lex.cc.orig	2006-03-31 18:10:45.000000000 +0100
++++ sql/sql_lex.cc	2006-04-17 12:09:26.000000000 +0100
+@@ -960,6 +960,9 @@
+       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++;
+       }