Changes 5.1.71:

Functionality Added or Changed
* comp_err now checks to make sure that new errors are not being added to MySQL 5.1 or 5.5 because the set of errors for these series is frozen.

Bugs Fixed
* InnoDB: During an insert buffer merge, InnoDB would invoke lock_rec_restore_from_page_infimum() on a potentially invalid record pointer.
* InnoDB: The page_zip_validate() consistency check would fail after compressing a page, in page_zip_compress(). This problem was caused by page_zip_decompress(), which would fail to set heap_no correctly when a record contained no user data bytes. A record with no user data bytes occurs when, for example, a primary key is an empty string and all secondary index fields are NULL or an empty string.
* InnoDB: The pthread_mutex, commit_threads_m, which was initialized but never used, has been removed from the code base.
* Partitioning: When dropping a partitioned table, the table's .par file was deleted first, before the table definition or data. This meant that, if the server failed during the drop operation, the table could be left in an inconsistent state in which it could neither be accessed nor dropped.
* Shared-compatibility conflict errors occurred for RPM install operations, even if no shared-compatibility RPMs were already installed.
* A user variable referenced during execution of a prepared statement is set to memory that is freed at the end of execution. A second execution of the statement could result in Valgrind warnings when accessing this memory.
* Misoptimization of left expressions in prepared statements could cause a server exit.
* Subsequent to Prepared statement needs to be re-prepared errors, inserts into DECIMAL columns caused a server exit.
* Assigning the result of a subquery to a user variable raised an assertion when the outer query included DISTINCT and GROUP BY.

4 files changed, 26 insertions, 16 deletions

diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 65bd68b4904..fc12f2bfa3d 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2013/08/04 10:20:24 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	2
 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 3275e332655..7894b97cdf4 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.28 2013/04/08 11:17:10 rodent Exp $
+# $NetBSD: Makefile.common,v 1.29 2013/08/04 10:20:24 adam Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 
-DISTNAME=	mysql-5.1.67
+DISTNAME=	mysql-5.1.71
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
@@ -32,12 +32,11 @@ PKG_GROUPS_VARS+=	MYSQL_GROUP
 
 # MYSQL_CHARSET		default character set
 # MYSQL_EXTRA_CHARSET	additional character set to be compiled in.
-#
 MYSQL_CHARSET?=		latin1
 MYSQL_EXTRA_CHARSET?=	all
 
 CONFIGURE_ARGS+=	--enable-thread-safe-client
-CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
 CONFIGURE_ARGS+=	--without-libwrap
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
@@ -52,7 +51,6 @@ BUILD_DEFS+=		VARBASE
 # We always use our own readline.  Note that these --without-* settings
 # are confusing, but they just mean "don't use the included readline
 # or libedit".
-#
 CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-libedit
 
@@ -62,8 +60,7 @@ CONFIGURE_ARGS+=	--disable-dependency-tracking
 
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--with-low-memory
-CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q}
-
+CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET:Q}
 CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
 
@@ -72,10 +69,8 @@ CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
 CONFIGURE_ARGS+=	--enable-assembler
 .endif
 
-#
 # MySQL 5.1 depends on builtin functions which enabled with i486 and
 # later with GCC.
-#
 .if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
 GNU_ARCH.i386=		i486
 CFLAGS+=		-march=i486
@@ -117,7 +112,7 @@ LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 TOOLS_PLATFORM.diff=	# empty
 .endif
 
-SUBST_CLASSES=		mk
+SUBST_CLASSES+=		mk
 SUBST_STAGE.mk=		pre-configure
 SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in	\
 			mysys/Makefile.in strings/Makefile.in
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index e905da1e570..e040bc2d366 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2013/01/21 08:58:43 adam Exp $
+$NetBSD: distinfo,v 1.25 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) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
@@ -27,3 +27,4 @@ SHA1 (patch-av) = b8fb1065d7e71522374a16d759d2f3ab5227f590
 SHA1 (patch-aw) = 50b811871b68506131020750f9af41e6834ec1cb
 SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23
 SHA1 (patch-ay) = 0b9c334c1e50c0c341e38d3fb189194de2d05b87
+SHA1 (patch-vio_viossl.c) = ad922587684a635a82c2fa662be7431c63063909
diff --git a/databases/mysql51-client/patches/patch-vio_viossl.c b/databases/mysql51-client/patches/patch-vio_viossl.c
new file mode 100644
index 00000000000..6a9bd8a0c9f
--- /dev/null
+++ b/databases/mysql51-client/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
+