Changes 5.5.51:

Bugs Fixed

Replication: When using statement-based or mixed binary logging format with --read-only=ON, it was not possible to modify temporary tables.

MySQL Server upgrades performed using RPM packages failed when upgrading from MySQL 5.1 Community to MySQL 5.5 Community or MySQL 5.1 Commercial to MySQL 5.5 Commercial.

A buffer overflow in the regex library was fixed.

Certain arguments to NAME_CONST() could cause a server exit.

Installing MySQL from a yum or zypper repository resulted in /var/log/mysqld.log being created with incorrect user and group permissions.

If a stored function updated a view for which the view table had a trigger defined that updated another table, it could fail and report an error that an existing table did not exist.

If an INSTALL PLUGIN statement contained invalid UTF-8 characters in the shared library name, it caused the server to hang (or to raise an assertion in debug builds).

For multibyte character sets, LOAD DATA could fail to allocate space correctly and ignore input rows as a result.

5 files changed, 19 insertions, 17 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index e67b54b0703..83ac5a4cef5 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 06:38:00 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/04 10:09:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (client)
 
 CONFLICTS=	mysql3-client-[0-9]*
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 9499186c7f5..bad78b64880 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.52 2016/06/14 16:49:17 adam Exp $
+# $NetBSD: Makefile.common,v 1.53 2016/08/04 10:09:46 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.50
+DISTNAME=	mysql-5.5.51
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 68dc0bb5440..68ab11deae1 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.50 2016/06/14 16:49:17 adam Exp $
+$NetBSD: distinfo,v 1.51 2016/08/04 10:09:46 adam Exp $
 
-SHA1 (mysql-5.5.50.tar.gz) = 08b27227d66b39b7914c6b5a0e16012dd57048a9
-RMD160 (mysql-5.5.50.tar.gz) = ac0cf9b983c2867dbfda4c64df959db229d894f4
-SHA512 (mysql-5.5.50.tar.gz) = 81d1327d8e99f57ba7dfd9f834f0e8e75f118b7a92375ca5799fa0cf66b0ec22cf2bd6f11f1d2d9c6bcb766a739743072cd4152f5d9c488203ac46f5471d980b
-Size (mysql-5.5.50.tar.gz) = 21029856 bytes
-SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071
-RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2
-SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
-Size (sphinx-2.2.10-release.tar.gz) = 3109250 bytes
+SHA1 (mysql-5.5.51.tar.gz) = 34a0b0ac0072bf3ed78a8021a7e7a0038eba9802
+RMD160 (mysql-5.5.51.tar.gz) = 9e32fe26c8f71b149356e98463eefa409249a05a
+SHA512 (mysql-5.5.51.tar.gz) = 674dea26172ce10ae85c30a092d8487f8136e5e7fdd23da1373092c4d5f4bd10c9778910bcc8ad04fa613231003e9e4ad3ee958dac5bb02ff8aeccd6a599b06b
+Size (mysql-5.5.51.tar.gz) = 21031206 bytes
+SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
+RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
+SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
+Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
diff --git a/databases/mysql55-client/options.mk b/databases/mysql55-client/options.mk
index 410af9dcc37..65c85171e1a 100644
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2015/11/11 11:00:06 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2016/08/04 10:09:46 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
@@ -27,9 +27,9 @@ CMAKE_ARGS+=		-DENABLE_DTRACE=OFF
 # http://sphinxsearch.com/docs/current.html#sphinxse-overview
 PLIST_VARS+=	sphinx
 .if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
-SPHINX_VER=	2.2.10
+SPHINX_VER=	2.2.11
 DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-SITES.sphinx-2.2.10-release.tar.gz=	http://sphinxsearch.com/files/
+SITES.sphinx-2.2.11-release.tar.gz=	http://sphinxsearch.com/files/
 .if !empty(PKGPATH:Mdatabases/mysql55-server)
 MESSAGE_SRC=	${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
 .endif
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 4030c1a0099..4566086afb1 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2016/06/14 16:49:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.43 2016/08/04 10:09:46 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1324,6 +1324,7 @@ share/mysql/test/std_data/bug16266.000001
 share/mysql/test/std_data/bug19371.MYD
 share/mysql/test/std_data/bug19371.MYI
 share/mysql/test/std_data/bug19371.frm
+share/mysql/test/std_data/bug20683959loaddata.txt
 share/mysql/test/std_data/bug30435_10k_items.txt
 share/mysql/test/std_data/bug30435_5k.txt
 share/mysql/test/std_data/bug33029-slave-relay-bin.000001
@@ -1476,6 +1477,7 @@ share/mysql/test/suite/binlog/r/binlog_bug23533.result
 share/mysql/test/suite/binlog/r/binlog_bug36391.result
 share/mysql/test/suite/binlog/r/binlog_database.result
 share/mysql/test/suite/binlog/r/binlog_delete_and_flush_index.result
+share/mysql/test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result
 share/mysql/test/suite/binlog/r/binlog_drop_if_exists.result
 share/mysql/test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
 share/mysql/test/suite/binlog/r/binlog_grant.result
@@ -1554,6 +1556,7 @@ share/mysql/test/suite/binlog/t/binlog_bug36391-master.opt
 share/mysql/test/suite/binlog/t/binlog_bug36391.test
 share/mysql/test/suite/binlog/t/binlog_database.test
 share/mysql/test/suite/binlog/t/binlog_delete_and_flush_index.test
+share/mysql/test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test
 share/mysql/test/suite/binlog/t/binlog_drop_if_exists.test
 share/mysql/test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
 share/mysql/test/suite/binlog/t/binlog_grant.test