4 files changed, 26 insertions, 9 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index cf104721bde..52bbc19dd21 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2013/08/04 10:20:24 adam 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 4c87848ffb1..96e2fd128cb 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2013/01/21 08:58:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2013/08/04 10:20:24 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -225,7 +225,6 @@ share/mysql-test/include/endspace.inc
 share/mysql-test/include/file_does_not_exist.inc
 share/mysql-test/include/force_restart.inc
 share/mysql-test/include/force_restart_if_skipped.inc
-share/mysql-test/include/get_binlog_dump_thread_id.inc
 share/mysql-test/include/get_relay_log_pos.inc
 share/mysql-test/include/gis_generic.inc
 share/mysql-test/include/gis_keys.inc
@@ -456,7 +455,6 @@ share/mysql-test/lib/My/Options.pm
 share/mysql-test/lib/My/Platform.pm
 share/mysql-test/lib/My/SafeProcess.pm
 share/mysql-test/lib/My/SafeProcess/Base.pm
-share/mysql-test/lib/My/SafeProcess/safe_process.pl
 share/mysql-test/lib/My/SysInfo.pm
 share/mysql-test/lib/My/Test.pm
 share/mysql-test/lib/mtr_cases.pm
@@ -2676,6 +2674,7 @@ share/mysql-test/suite/innodb/r/innodb_bug12400341.result
 share/mysql-test/suite/innodb/r/innodb_bug12661768.result
 share/mysql-test/suite/innodb/r/innodb_bug13510739.result
 share/mysql-test/suite/innodb/r/innodb_bug13635833.result
+share/mysql-test/suite/innodb/r/innodb_bug14676111.result
 share/mysql-test/suite/innodb/r/innodb_bug14704286.result
 share/mysql-test/suite/innodb/r/innodb_bug21704.result
 share/mysql-test/suite/innodb/r/innodb_bug30423.result
@@ -2741,6 +2740,7 @@ share/mysql-test/suite/innodb/t/innodb_bug12661768.test
 share/mysql-test/suite/innodb/t/innodb_bug13510739.test
 share/mysql-test/suite/innodb/t/innodb_bug13635833.test
 share/mysql-test/suite/innodb/t/innodb_bug14007649.test
+share/mysql-test/suite/innodb/t/innodb_bug14676111.test
 share/mysql-test/suite/innodb/t/innodb_bug14704286.test
 share/mysql-test/suite/innodb/t/innodb_bug21704.test
 share/mysql-test/suite/innodb/t/innodb_bug30423.test
@@ -2825,6 +2825,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb_bug12400341.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug13510739.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug13635833.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug14007649.result
+share/mysql-test/suite/innodb_plugin/r/innodb_bug14676111.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug30423.result
 share/mysql-test/suite/innodb_plugin/r/innodb_bug30919.result
@@ -2923,6 +2924,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb_bug12400341.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug13510739.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug13635833.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug14007649.test
+share/mysql-test/suite/innodb_plugin/t/innodb_bug14676111.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug30423.test
 share/mysql-test/suite/innodb_plugin/t/innodb_bug30919-master.opt
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 9b2cb798b0a..78fbf81c10c 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2013/01/21 08:58:44 adam Exp $
+$NetBSD: distinfo,v 1.28 2013/08/04 10:20:24 adam Exp $
 
-SHA1 (mysql-5.1.67.tar.gz) = f1a7854701a1146b109c30d61236802523969b8d
-RMD160 (mysql-5.1.67.tar.gz) = 5d4412988f50b1f44b4d7a83b943f0804626894e
-Size (mysql-5.1.67.tar.gz) = 24781885 bytes
+SHA1 (mysql-5.1.71.tar.gz) = a71c77c43aa8374ccb6e09f0ad7f225846af59e6
+RMD160 (mysql-5.1.71.tar.gz) = 4077b4aab7297a48b5dc180acf35c9a94bce366c
+Size (mysql-5.1.71.tar.gz) = 24033179 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
@@ -26,3 +26,4 @@ SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
 SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
 SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
 SHA1 (patch-sql_ha_ndbcluster.cc) = eb076bbce9d1d671331b41f50cf0be220cca7c6b
+SHA1 (patch-vio_viossl.c) = ad922587684a635a82c2fa662be7431c63063909
diff --git a/databases/mysql51-server/patches/patch-vio_viossl.c b/databases/mysql51-server/patches/patch-vio_viossl.c
new file mode 100644
index 00000000000..6a9bd8a0c9f
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-vio_viossl.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-vio_viossl.c,v 1.1 2013/08/04 10:20:24 adam Exp $
+
+Compatibility fix.
+
+--- vio/viossl.c.orig	2013-07-11 13:39:36.000000000 +0000
++++ vio/viossl.c
+@@ -198,7 +198,7 @@ static int ssl_do(struct st_VioSSLFd *pt
+   SSL_clear(ssl);
+   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
+   SSL_set_fd(ssl, vio->sd);
+-#ifndef HAVE_YASSL
++#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
+   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
+ #endif
+