update to 5.1.46, from Brad

databases/mysql/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.164 2010/04/03 00:21:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.165 2010/04/27 11:03:52 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,11 +6,11 @@ COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite/benchmark)
 
-VERSION=	5.1.45
+VERSION=	5.1.46
 DISTNAME=	mysql-${VERSION}
-PKGNAME-main=	mysql-client-${VERSION}p0
-PKGNAME-server=	mysql-server-${VERSION}p1
-PKGNAME-tests= 	mysql-tests-${VERSION}p0
+PKGNAME-main=	mysql-client-${VERSION}
+PKGNAME-server=	mysql-server-${VERSION}
+PKGNAME-tests= 	mysql-tests-${VERSION}
 CATEGORIES=	databases
 V=		MySQL-5.1
 MASTER_SITES=	${MASTER_SITE_MYSQL:=Downloads/$V/}

databases/mysql/distinfo

@@ -1,5 +1,5 @@
-MD5 (mysql-5.1.45.tar.gz) = BrXes6E8dgDDi6Zbn35CxA==
-RMD160 (mysql-5.1.45.tar.gz) = L9FzrESErnp0LwbY0M2xyAfAK7o=
-SHA1 (mysql-5.1.45.tar.gz) = KjRlDcGn4FZ4iIJSIhHQd5Hgs1I=
-SHA256 (mysql-5.1.45.tar.gz) = fcL6u92KsdKHjudJvpxW/8nv6XD38PCUqpSxizzRWnI=
-SIZE (mysql-5.1.45.tar.gz) = 22457274
+MD5 (mysql-5.1.46.tar.gz) = BPfBQiGZxzqIo9QIuRYbYw==
+RMD160 (mysql-5.1.46.tar.gz) = EjeDTbMUKC9iE3JO0/JJ0UQ8Qa0=
+SHA1 (mysql-5.1.46.tar.gz) = XfbPiiS4DLdDAcgnWyY5EmLF/3Y=
+SHA256 (mysql-5.1.46.tar.gz) = 0GZRIl+E8z/PWQyGMPcGFMZnddOdE2WoFmnJCun15Cw=
+SIZE (mysql-5.1.46.tar.gz) = 23510197

databases/mysql/patches/patch-sql_mysqld_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-sql_mysqld_cc,v 1.20 2010/03/21 01:20:47 sthen Exp $
---- sql/mysqld.cc.orig	Thu Feb  4 06:39:50 2010
-+++ sql/mysqld.cc	Fri Feb 19 20:23:28 2010
-@@ -4367,7 +4367,7 @@ int main(int argc, char **argv)
+$OpenBSD: patch-sql_mysqld_cc,v 1.21 2010/04/27 11:03:52 sthen Exp $
+--- sql/mysqld.cc.orig	Tue Apr  6 10:07:02 2010
++++ sql/mysqld.cc	Sat Apr 24 23:20:23 2010
+@@ -4369,7 +4369,7 @@ int main(int argc, char **argv)
    select_thread_in_use=1;
  
  #ifdef HAVE_LIBWRAP