Changes 5.5.33:

* Previously, program options could be specified in full or as any unambiguous prefix. For example, the --compress option could be given to mysqldump as --compr, but not as --comp because the latter is ambiguous. Option prefixes now are deprecated. They can cause problems when new options are implemented for programs. A prefix that is currently unambiguous might become ambiguous in the future. If an unambiguous prefix is given, a warning now occurs to provide feedback. For example:

Warning: Using unique option prefix compr instead of compress is
deprecated and will be removed in a future release. Please use the
full name instead.

Option prefixes are no longer supported in MySQL 5.7; only full options are accepted.

* 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

4 files changed, 8 insertions, 13 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 2cfc4a1a6ae..cf7792e15cd 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/07/17 21:22:40 adam Exp $
+# $NetBSD: Makefile,v 1.11 2013/07/31 18:51:41 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqc
 COMMENT=	MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 76d1f246da7..b3e5b24f56a 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile.common,v 1.29 2013/07/17 21:22:40 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2013/07/31 18:51:41 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.32
+DISTNAME=	mysql-5.5.33
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
-# XXX: distfile got changed; remove the following line on next update
-DIST_SUBDIR=	mysql
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mysql.com/
@@ -17,7 +15,6 @@ DISTINFO_FILE?=		${.CURDIR}/../../databases/mysql55-client/distinfo
 PATCHDIR?=		${.CURDIR}/../../databases/mysql55-client/patches
 
 USE_CMAKE=		yes
-USE_GNU_READLINE=	yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bash gmake perl:run
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index f3d2a6b7f9a..1811d494630 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2013/07/17 21:22:40 adam Exp $
+$NetBSD: distinfo,v 1.25 2013/07/31 18:51:41 adam Exp $
 
-SHA1 (mysql/mysql-5.5.32.tar.gz) = 4f9accac6de6fcca4d729a3b0f98fc76ffb73867
-RMD160 (mysql/mysql-5.5.32.tar.gz) = e59a9166a93fd873ef4fc7afa70204dc16c1f662
-Size (mysql/mysql-5.5.32.tar.gz) = 24589274 bytes
+SHA1 (mysql-5.5.33.tar.gz) = 40c6d63e8a959458737f6fa485d3598c12aef670
+RMD160 (mysql-5.5.33.tar.gz) = a2574b2ff320b0b4f93fb3a616f4ebbacd31f641
+Size (mysql-5.5.33.tar.gz) = 24680463 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index ba0249849a8..03a38aaeb8a 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2013/07/17 21:22:40 adam Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/31 18:51:41 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	2
 SVR4_PKGNAME=	mysqs
 COMMENT=	MySQL 5, a free SQL database (server)