Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.148
diff -N -u -r1.148 Makefile
--- Makefile	17 Feb 2009 10:46:59 -0000	1.148
+++ Makefile	3 May 2009 12:19:09 -0000
@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.148 2009/02/17 10:46:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.152 2009/05/03 12:19:09 sthen Exp $
 
 COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite)
 
-VERSION=	5.0.77
+VERSION=	5.0.81
 DISTNAME=	mysql-${VERSION}
 PKGNAME-main=	mysql-client-${VERSION}
 PKGNAME-server=	mysql-server-${VERSION}
 PKGNAME-tests= 	mysql-tests-${VERSION}
 CATEGORIES=	databases
 V=		MySQL-5.0
-MASTER_SITES=	${MASTER_SITES_MYSQL:=Downloads/$V/}
+MASTER_SITES=	${MASTER_SITE_MYSQL:=Downloads/$V/}
 
 SHARED_LIBS +=	mysqlclient_r		19.0
 SHARED_LIBS +=	mysqlclient		19.0
@@ -47,7 +47,7 @@
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= autoconf
 # Should be 2.63
-AUTOCONF_VERSION= 2.62
+AUTOCONF_VERSION= 2.61
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-thread-safe-client \
 		 --localstatedir="${DB_DIR}" \
@@ -81,10 +81,10 @@
 
 MULTI_PACKAGES=		-main -server -tests
 
-RUN_DEPENDS-server=	:mysql-client-5.0.*:databases/mysql \
+RUN_DEPENDS-server=	:mysql-client->=5.0,<5.1:databases/mysql \
 			:p5-DBD-mysql-*:databases/p5-DBD-mysql
 
-LIB_DEPENDS-server=	mysqlclient:mysql-client-5.0.*:databases/mysql
+LIB_DEPENDS-server=	mysqlclient:mysql-client->=5.0,<5.1:databases/mysql
 
 WANTLIB-server=		${WANTLIB} wrap		
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.36
diff -N -u -r1.36 distinfo
--- distinfo	17 Feb 2009 10:47:00 -0000	1.36
+++ distinfo	3 May 2009 12:19:09 -0000
@@ -1,5 +1,5 @@
-MD5 (mysql-5.0.77.tar.gz) = bDCiDJBZ2vBTowHpJ+sWZw==
-RMD160 (mysql-5.0.77.tar.gz) = ZkyRv49+LCkgZqg6g8xg9W+JBRY=
-SHA1 (mysql-5.0.77.tar.gz) = 26uPYX1zABkiCGwdIPqMZfFvCuo=
-SHA256 (mysql-5.0.77.tar.gz) = qTEZFYWCecODIQDELk4rEnkKuITcMSS8RTVar0JKFeg=
-SIZE (mysql-5.0.77.tar.gz) = 34453169
+MD5 (mysql-5.0.81.tar.gz) = LTXkmA8nnIORcqbv2w8LFQ==
+RMD160 (mysql-5.0.81.tar.gz) = wN/cgUT3IaSvXtOCAOcjOGgDNpU=
+SHA1 (mysql-5.0.81.tar.gz) = KqrvigjusLv/RspsGx+NQWrVwYo=
+SHA256 (mysql-5.0.81.tar.gz) = jYl49oBikqHbtCIMg5/VTnmhMY5Bv+GnYOJoySA7RTw=
+SIZE (mysql-5.0.81.tar.gz) = 34599007
Index: patches/patch-sql_mysqld_cc
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-sql_mysqld_cc,v
retrieving revision 1.13
diff -N -u -r1.13 patches/patch-sql_mysqld_cc
--- patches/patch-sql_mysqld_cc	17 Feb 2009 10:47:00 -0000	1.13
+++ patches/patch-sql_mysqld_cc	3 May 2009 12:19:09 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-sql_mysqld_cc,v 1.13 2009/02/17 10:47:00 sthen Exp $
---- sql/mysqld.cc.orig	Thu Jan 29 16:45:28 2009
-+++ sql/mysqld.cc	Mon Feb 16 14:22:00 2009
-@@ -3746,7 +3746,7 @@ int main(int argc, char **argv)
+$OpenBSD: patch-sql_mysqld_cc,v 1.14 2009/05/03 12:19:09 sthen Exp $
+--- sql/mysqld.cc.orig	Thu Apr 16 07:51:01 2009
++++ sql/mysqld.cc	Sat May  2 15:57:10 2009
+@@ -3748,7 +3748,7 @@ int main(int argc, char **argv)
    init_ssl();
  
  #ifdef HAVE_LIBWRAP
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-tests,v
retrieving revision 1.28
diff -N -u -r1.28 pkg/PLIST-tests
--- pkg/PLIST-tests	28 Dec 2008 19:45:17 -0000	1.28
+++ pkg/PLIST-tests	3 May 2009 12:19:09 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-tests,v 1.28 2008/12/28 19:45:17 sthen Exp $
+@comment $OpenBSD: PLIST-tests,v 1.29 2009/05/03 12:19:09 sthen Exp $
 @man man/man1/mysql-stress-test.pl.1
 @man man/man1/mysql-test-run.pl.1
 @man man/man1/mysql_client_test.1
@@ -11,6 +11,7 @@
 share/mysql-test/include/check-testcase.test
 share/mysql-test/include/check_var_limit.inc
 share/mysql-test/include/common-tests.inc
+share/mysql-test/include/count_sessions.inc
 share/mysql-test/include/ctype_common.inc
 share/mysql-test/include/ctype_filesort.inc
 share/mysql-test/include/ctype_innodb_like.inc
@@ -62,6 +63,7 @@
 share/mysql-test/include/im_check_env.inc
 share/mysql-test/include/innodb_rollback_on_timeout.inc
 share/mysql-test/include/loaddata_autocom.inc
+share/mysql-test/include/master-slave-end.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
 share/mysql-test/include/ndb_backup.inc
@@ -86,6 +88,8 @@
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
 share/mysql-test/include/sp-vars.inc
+share/mysql-test/include/start_slave.inc
+share/mysql-test/include/stop_slave.inc
 share/mysql-test/include/strict_autoinc.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
@@ -96,11 +100,16 @@
 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_param.inc
+share/mysql-test/include/wait_for_slave_sql_error.inc
+share/mysql-test/include/wait_for_slave_sql_error_and_skip.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_condition.inc
 share/mysql-test/include/wait_show_pattern.inc
 share/mysql-test/include/wait_slave_status.inc
+share/mysql-test/include/wait_until_count_sessions.inc
+share/mysql-test/include/wait_until_disconnected.inc
 share/mysql-test/include/windows.inc
 share/mysql-test/install_test_db
 share/mysql-test/lib/
@@ -353,6 +362,7 @@
 share/mysql-test/r/innodb-ucs2.result
 share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_bug35220.result
+share/mysql-test/r/innodb_bug42419.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
@@ -383,6 +393,8 @@
 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_multi_bug38499.result
+share/mysql-test/r/lock_multi_bug38691.result
 share/mysql-test/r/lock_tables_lost_commit.result
 share/mysql-test/r/long_tmpdir.result
 share/mysql-test/r/lowercase0.require
@@ -395,6 +407,7 @@
 share/mysql-test/r/lowercase_table3.result
 share/mysql-test/r/lowercase_table_grant.result
 share/mysql-test/r/lowercase_table_qcache.result
+share/mysql-test/r/lowercase_utf8.result
 share/mysql-test/r/lowercase_view.result
 share/mysql-test/r/merge.result
 share/mysql-test/r/metadata.result
@@ -406,6 +419,7 @@
 share/mysql-test/r/myisam-blob.result
 share/mysql-test/r/myisam.result
 share/mysql-test/r/myisampack.result
+share/mysql-test/r/mysql-bug41486.result
 share/mysql-test/r/mysql.result
 share/mysql-test/r/mysql_client_test.result
 share/mysql-test/r/mysql_comments.result
@@ -560,6 +574,7 @@
 share/mysql-test/r/rpl_empty_master_crash.result
 share/mysql-test/r/rpl_error_ignored_table.result
 share/mysql-test/r/rpl_failed_optimize.result
+share/mysql-test/r/rpl_filter_tables_not_exist.result
 share/mysql-test/r/rpl_flush_log_loop.result
 share/mysql-test/r/rpl_flush_tables.result
 share/mysql-test/r/rpl_free_items.result
@@ -799,9 +814,7 @@
 share/mysql-test/std_data/rpl_loaddata.dat
 share/mysql-test/std_data/rpl_loaddata2.dat
 share/mysql-test/std_data/rpl_timezone.dat
-share/mysql-test/std_data/server-cert-des.pem
 share/mysql-test/std_data/server-cert.pem
-share/mysql-test/std_data/server-key-des.pem
 share/mysql-test/std_data/server-key.pem
 share/mysql-test/std_data/server8k-cert.pem
 share/mysql-test/std_data/server8k-key.pem
@@ -1606,6 +1619,7 @@
 share/mysql-test/t/innodb-ucs2.test
 share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_bug35220.test
+share/mysql-test/t/innodb_bug42419.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
 share/mysql-test/t/innodb_gis.test
@@ -1640,6 +1654,8 @@
 share/mysql-test/t/loaddata_autocom_ndb.test
 share/mysql-test/t/lock.test
 share/mysql-test/t/lock_multi.test
+share/mysql-test/t/lock_multi_bug38499.test
+share/mysql-test/t/lock_multi_bug38691.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
@@ -1659,6 +1675,8 @@
 share/mysql-test/t/lowercase_table_grant.test
 share/mysql-test/t/lowercase_table_qcache-master.opt
 share/mysql-test/t/lowercase_table_qcache.test
+share/mysql-test/t/lowercase_utf8-master.opt
+share/mysql-test/t/lowercase_utf8.test
 share/mysql-test/t/lowercase_view-master.opt
 share/mysql-test/t/lowercase_view.test
 share/mysql-test/t/merge.test
@@ -1677,6 +1695,7 @@
 share/mysql-test/t/myisam-blob.test
 share/mysql-test/t/myisam.test
 share/mysql-test/t/myisampack.test
+share/mysql-test/t/mysql-bug41486.test
 share/mysql-test/t/mysql.test
 share/mysql-test/t/mysql_client_test.opt
 share/mysql-test/t/mysql_client_test.test
@@ -1857,6 +1876,8 @@
 share/mysql-test/t/rpl_error_ignored_table.test
 share/mysql-test/t/rpl_failed_optimize-master.opt
 share/mysql-test/t/rpl_failed_optimize.test
+share/mysql-test/t/rpl_filter_tables_not_exist-slave.opt
+share/mysql-test/t/rpl_filter_tables_not_exist.test
 share/mysql-test/t/rpl_flush_log_loop-master.opt
 share/mysql-test/t/rpl_flush_log_loop-master.sh
 share/mysql-test/t/rpl_flush_log_loop-slave.opt