Update mysql51-client/mysql51-server package to 5.1.45.

This is maintainous release and please refer for full changes:

	http://dev.mysql.com/doc/refman/5.1/en/news-5-1-45.html

Added a patch for recent security problem to mysql51-server, too.

	http://secunia.com/advisories/39454

7 files changed, 42 insertions, 17 deletions

diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index acfd3cc2a45..24bad74afa0 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2010/03/21 14:39:27 taca Exp $
+# $NetBSD: Makefile,v 1.4 2010/04/20 22:58:10 taca Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index 21bfe6cfe2a..c24fee782b8 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.4 2010/04/08 15:31:55 taca Exp $
+# $NetBSD: Makefile.common,v 1.5 2010/04/20 22:58:10 taca Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 #
 
-DISTNAME=		mysql-5.1.44
+DISTNAME=		mysql-5.1.45
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 329c0617143..9225b34c823 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: distinfo,v 1.2 2010/04/20 22:58:10 taca Exp $
 
-SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206
-RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a
-Size (mysql-5.1.44.tar.gz) = 23400457 bytes
+SHA1 (mysql-5.1.45.tar.gz) = 2a34650dc1a7e056788882522211d07791e0b352
+RMD160 (mysql-5.1.45.tar.gz) = 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba
+Size (mysql-5.1.45.tar.gz) = 22457274 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4
 SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index cd64128d3c7..223c40c9d63 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2010/03/21 14:41:41 taca Exp $
+# $NetBSD: Makefile,v 1.4 2010/04/20 22:58:10 taca Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		2
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 5, a free SQL database (server)
 
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 3ea82946f42..1926d382e01 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/03/21 14:41:41 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/04/20 22:58:10 taca Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -310,6 +310,7 @@ share/mysql-test/include/no_running_event_scheduler.inc
 share/mysql-test/include/no_running_events.inc
 share/mysql-test/include/no_valgrind_without_big.inc
 share/mysql-test/include/not_as_root.inc
+share/mysql-test/include/not_binlog_format_row.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_ndb.inc
 share/mysql-test/include/not_ndb_default.inc
@@ -460,6 +461,7 @@ share/mysql-test/r/binary.result
 share/mysql-test/r/binlog_tx_isolation.result
 share/mysql-test/r/bool.result
 share/mysql-test/r/bootstrap.result
+share/mysql-test/r/bug39022.result
 share/mysql-test/r/bug46080.result
 share/mysql-test/r/bug46760.result
 share/mysql-test/r/bug47671.result
@@ -803,6 +805,7 @@ share/mysql-test/r/named_pipe.result
 share/mysql-test/r/ndb_default_cluster.require
 share/mysql-test/r/negation_elimination.result
 share/mysql-test/r/no-threads.result
+share/mysql-test/r/no_binlog.result
 share/mysql-test/r/not_embedded.require
 share/mysql-test/r/not_embedded_server.result
 share/mysql-test/r/not_ndb.require
@@ -837,6 +840,7 @@ share/mysql-test/r/partition_bug18198.result
 share/mysql-test/r/partition_charset.result
 share/mysql-test/r/partition_csv.result
 share/mysql-test/r/partition_datatype.result
+share/mysql-test/r/partition_debug_sync.result
 share/mysql-test/r/partition_disabled.result
 share/mysql-test/r/partition_error.result
 share/mysql-test/r/partition_federated.result
@@ -1004,10 +1008,10 @@ 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+c.result
 share/mysql-test/r/variables-big.result
 share/mysql-test/r/variables-notembedded.result
 share/mysql-test/r/variables.result
+share/mysql-test/r/variables_community.result
 share/mysql-test/r/variables_debug.result
 share/mysql-test/r/view.result
 share/mysql-test/r/view_grant.result
@@ -1043,6 +1047,7 @@ share/mysql-test/std_data/bug47012.ARM
 share/mysql-test/std_data/bug47012.ARZ
 share/mysql-test/std_data/bug47012.frm
 share/mysql-test/std_data/bug47142_master-bin.000001
+share/mysql-test/std_data/bug48449.frm
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/charset_utf8.txt
 share/mysql-test/std_data/client-cert.pem
@@ -2607,6 +2612,7 @@ share/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
 share/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
 share/mysql-test/suite/rpl/r/rpl_slave_skip.result
 share/mysql-test/suite/rpl/r/rpl_slave_status.result
+share/mysql-test/suite/rpl/r/rpl_slow_query_log.result
 share/mysql-test/suite/rpl/r/rpl_sp.result
 share/mysql-test/suite/rpl/r/rpl_sp004.result
 share/mysql-test/suite/rpl/r/rpl_sp_effects.result
@@ -2930,6 +2936,8 @@ share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
 share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
 share/mysql-test/suite/rpl/t/rpl_slave_skip.test
 share/mysql-test/suite/rpl/t/rpl_slave_status.test
+share/mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
+share/mysql-test/suite/rpl/t/rpl_slow_query_log.test
 share/mysql-test/suite/rpl/t/rpl_sp-master.opt
 share/mysql-test/suite/rpl/t/rpl_sp-slave.opt
 share/mysql-test/suite/rpl/t/rpl_sp.test
@@ -3148,6 +3156,7 @@ share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
 share/mysql-test/t/bool.test
 share/mysql-test/t/bootstrap.test
+share/mysql-test/t/bug39022.test
 share/mysql-test/t/bug46080-master.opt
 share/mysql-test/t/bug46080.test
 share/mysql-test/t/bug46760-master.opt
@@ -3507,6 +3516,7 @@ share/mysql-test/t/named_pipe.test
 share/mysql-test/t/negation_elimination.test
 share/mysql-test/t/no-threads-master.opt
 share/mysql-test/t/no-threads.test
+share/mysql-test/t/no_binlog.test
 share/mysql-test/t/not_embedded_server-master.opt
 share/mysql-test/t/not_embedded_server.test
 share/mysql-test/t/not_partition.test
@@ -3535,6 +3545,7 @@ share/mysql-test/t/partition_bug18198.test
 share/mysql-test/t/partition_charset.test
 share/mysql-test/t/partition_csv.test
 share/mysql-test/t/partition_datatype.test
+share/mysql-test/t/partition_debug_sync.test
 share/mysql-test/t/partition_disabled-master.opt
 share/mysql-test/t/partition_disabled.test
 share/mysql-test/t/partition_error.test
@@ -3723,11 +3734,11 @@ share/mysql-test/t/user_limits.test
 share/mysql-test/t/user_var-binlog.test
 share/mysql-test/t/user_var.test
 share/mysql-test/t/varbinary.test
-share/mysql-test/t/variables+c.test
 share/mysql-test/t/variables-big.test
 share/mysql-test/t/variables-notembedded-master.opt
 share/mysql-test/t/variables-notembedded.test
 share/mysql-test/t/variables.test
+share/mysql-test/t/variables_community.test
 share/mysql-test/t/variables_debug.test
 share/mysql-test/t/view.test
 share/mysql-test/t/view_grant.test
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 040c7656ecc..520d2370b04 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/03/21 14:41:41 taca Exp $
+$NetBSD: distinfo,v 1.3 2010/04/20 22:58:10 taca Exp $
 
-SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206
-RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a
-Size (mysql-5.1.44.tar.gz) = 23400457 bytes
+SHA1 (mysql-5.1.45.tar.gz) = 2a34650dc1a7e056788882522211d07791e0b352
+RMD160 (mysql-5.1.45.tar.gz) = 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba
+Size (mysql-5.1.45.tar.gz) = 22457274 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
@@ -24,5 +24,6 @@ SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae
 SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
 SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
 SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
+SHA1 (patch-av) = 3fb1d881f7d88a72a84abd28d269236b1a84164e
 SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
 SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
diff --git a/databases/mysql51-server/patches/patch-av b/databases/mysql51-server/patches/patch-av
new file mode 100644
index 00000000000..12677db0091
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-av
@@ -0,0 +1,15 @@
+$NetBSD: patch-av,v 1.1 2010/04/20 22:58:10 taca Exp $
+
+Security fix for http://secunia.com/advisories/39454/.
+
+--- sql/sql_plugin.cc.orig	2010-03-01 19:33:41.000000000 +0000
++++ sql/sql_plugin.cc
+@@ -1736,6 +1736,8 @@ bool mysql_uninstall_plugin(THD *thd, co
+   bzero(&tables, sizeof(tables));
+   tables.db= (char *)"mysql";
+   tables.table_name= tables.alias= (char *)"plugin";
++  if (check_table_access(thd, DELETE_ACL, &tables, 1, FALSE))
++    DBUG_RETURN(TRUE);
+ 
+   /* need to open before acquiring LOCK_plugin or it will deadlock */
+   if (! (table= open_ltable(thd, &tables, TL_WRITE, 0)))