Changes 5.5.46:

* yaSSL was upgraded to version 2.3.8.
* InnoDB: A data corruption occurred on ARM64. GCC builtins did not issue the correct fences when setting or unsetting the lock word.
* InnoDB: In READ COMMITTED mode, a REPLACE operation on a unique secondary index resulted in a constraint violation. Thanks to Alexey Kopytov for the patch.
* InnoDB: The IBUF_BITMAP_FREE bit indicated that there was more free space in the leaf page than was actually available.
* InnoDB: Setting lower_case_table_names=0 on a case-insensitive file system could result in a hang condition when running an INSERT INTO ... SELECT ... FROM tbl_name operation with the wrong tbl_name letter case. An error message is now printed and the server exits when attempting to start the server with --lower_case_table_names=0 on a case-insensitive file system.
* Partitioning: CREATE TABLE statements that used an invalid function in a subpartitioning expression did not always fail gracefully as expected.
* Partitioning: ALTER TABLE when executed from a stored procedure did not always work correctly with tables partitioned by RANGE.
* Certain subqueries as arguments to PROCEDURE ANALYSE() could cause a server exit.
* mysql_ssl_rsa_setup could create an unwanted .rnd file in the data directory. (The file is actually created by openssl, which mysql_ssl_ras_setup invokes. mysql_ssl_rsa_setup now cleans up the file.)
* An assertion could be raised due to incorrect error handling if a SELECT ... FOR UPDATE subquery resulted in deadlock and caused a rollback.
* Servers linked against yaSSL and compiled with GCC 4.8.2 could fail to respond correctly to connection attempts until several seconds after startup.
* For tables with subpartitions, the server could exit due to incorrect error handling during partition pruning if the partition could be identified but not the subpartition.
* DELETE could check privileges for the wrong database when table aliases were used.
* Within a trigger, use of a cursor that accessed OLD or NEW values from a row could cause a server exit.
* MySQL sometimes produced no warning when it was unable to interpret a character in a given character set.
* For MySQL distributions linked against yaSSL, a corrupt client key file could cause clients to exit.
* Execution of certain BINLOG statements while temporary tables were open by HANDLER statements could cause a server exit.

4 files changed, 17 insertions, 21 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index fcc982fec19..e8e6b687f0e 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.46 2015/07/30 14:36:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.47 2015/10/03 12:13:29 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.45
+DISTNAME=	mysql-5.5.46
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index c4922bb482e..339716cfd72 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.44 2015/07/30 14:36:34 adam Exp $
+$NetBSD: distinfo,v 1.45 2015/10/03 12:13:29 adam Exp $
 
-SHA1 (mysql-5.5.45.tar.gz) = 225f7979d37c5877696c89195acc8e70df03d702
-RMD160 (mysql-5.5.45.tar.gz) = dbdf56a703c10722bae01e2707a9fcccf769edcd
-Size (mysql-5.5.45.tar.gz) = 21832364 bytes
-SHA1 (sphinx-2.2.9-release.tar.gz) = 7ddde51bb1d428406acb278c615a2c2fda819daf
-RMD160 (sphinx-2.2.9-release.tar.gz) = e600bb0fcbb3fe9838dc60bd8b00ca2bedd0ce05
-Size (sphinx-2.2.9-release.tar.gz) = 2992905 bytes
+SHA1 (mysql-5.5.46.tar.gz) = d0ad18d3cd624902c92679f0150c62b06e6a569d
+RMD160 (mysql-5.5.46.tar.gz) = 463e3e6c4af4ab4e48534745c6bffb53ee613fd7
+Size (mysql-5.5.46.tar.gz) = 21838374 bytes
+SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071
+RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2
+Size (sphinx-2.2.10-release.tar.gz) = 3109250 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 ab97e758b3b..13d99c47932 100644
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2015/07/30 14:36:34 adam Exp $
+# $NetBSD: options.mk,v 1.10 2015/10/03 12:13:29 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
@@ -25,9 +25,9 @@ CMAKE_ARGS+=		-DENABLE_DTRACE=ON
 # 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.9
+SPHINX_VER=	2.2.10
 DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-SITES.sphinx-2.2.9-release.tar.gz=	http://sphinxsearch.com/files/
+SITES.sphinx-2.2.10-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 134cecfb13c..1ebd080361b 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2015/07/30 14:36:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.38 2015/10/03 12:13:29 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -988,11 +988,11 @@ share/mysql/test/r/lowercase0.require
 share/mysql/test/r/lowercase1.require
 share/mysql/test/r/lowercase2.require
 share/mysql/test/r/lowercase_fs_off.result
+share/mysql/test/r/lowercase_fs_on.result
 share/mysql/test/r/lowercase_mixed_tmpdir.result
 share/mysql/test/r/lowercase_mixed_tmpdir_innodb.result
 share/mysql/test/r/lowercase_table.result
 share/mysql/test/r/lowercase_table2.result
-share/mysql/test/r/lowercase_table3.result
 share/mysql/test/r/lowercase_table4.result
 share/mysql/test/r/lowercase_table_grant.result
 share/mysql/test/r/lowercase_table_qcache.result
@@ -1314,6 +1314,8 @@ share/mysql/test/std_data/binlog_savepoint.000001
 share/mysql/test/std_data/binlog_transaction.000001
 share/mysql/test/std_data/bug11747416_32228_binlog.000001
 share/mysql/test/std_data/bug15328.cnf
+share/mysql/test/std_data/bug16171518_1.dat
+share/mysql/test/std_data/bug16171518_2.dat
 share/mysql/test/std_data/bug16266.000001
 share/mysql/test/std_data/bug19371.MYD
 share/mysql/test/std_data/bug19371.MYI
@@ -3117,7 +3119,6 @@ share/mysql/test/suite/innodb/t/innodb_bug60049-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug60049.test
 share/mysql/test/suite/innodb/t/innodb_bug60196-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug60196.test
-share/mysql/test/suite/innodb/t/innodb_bug60229-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug60229.test
 share/mysql/test/suite/innodb/t/innodb_corrupt_bit.test
 share/mysql/test/suite/innodb/t/innodb_file_format-master.opt
@@ -3315,13 +3316,9 @@ share/mysql/test/suite/jp/t/jp_create_tbl_sjis.test
 share/mysql/test/suite/jp/t/jp_create_tbl_ucs2.test
 share/mysql/test/suite/jp/t/jp_create_tbl_ujis.test
 share/mysql/test/suite/jp/t/jp_create_tbl_utf8.test
-share/mysql/test/suite/jp/t/jp_enum_sjis-master.opt
 share/mysql/test/suite/jp/t/jp_enum_sjis.test
-share/mysql/test/suite/jp/t/jp_enum_ucs2-master.opt
 share/mysql/test/suite/jp/t/jp_enum_ucs2.test
-share/mysql/test/suite/jp/t/jp_enum_ujis-master.opt
 share/mysql/test/suite/jp/t/jp_enum_ujis.test
-share/mysql/test/suite/jp/t/jp_enum_utf8-master.opt
 share/mysql/test/suite/jp/t/jp_enum_utf8.test
 share/mysql/test/suite/jp/t/jp_insert_sjis.test
 share/mysql/test/suite/jp/t/jp_insert_ucs2.test
@@ -5946,6 +5943,7 @@ share/mysql/test/t/long_tmpdir-master.opt
 share/mysql/test/t/long_tmpdir-master.sh
 share/mysql/test/t/long_tmpdir.test
 share/mysql/test/t/lowercase_fs_off.test
+share/mysql/test/t/lowercase_fs_on.test
 share/mysql/test/t/lowercase_mixed_tmpdir-master.opt
 share/mysql/test/t/lowercase_mixed_tmpdir-master.sh
 share/mysql/test/t/lowercase_mixed_tmpdir.test
@@ -5955,8 +5953,6 @@ share/mysql/test/t/lowercase_mixed_tmpdir_innodb.test
 share/mysql/test/t/lowercase_table-master.opt
 share/mysql/test/t/lowercase_table.test
 share/mysql/test/t/lowercase_table2.test
-share/mysql/test/t/lowercase_table3-master.opt
-share/mysql/test/t/lowercase_table3.test
 share/mysql/test/t/lowercase_table4-master.opt
 share/mysql/test/t/lowercase_table4.test
 share/mysql/test/t/lowercase_table_grant-master.opt