Changes 5.5.45:

* Security Fix: Due to the LogJam issue (https://weakdh.org/), OpenSSL has changed the Diffie-Hellman key length parameters for openssl-1.0.1n and up. OpenSSL has provided a detailed explanation at http://openssl.org/news/secadv_20150611.txt. To adopt this change in MySQL, the key length used in vio/viosslfactories.c for creating Diffie-Hellman keys has been increased from 512 to 2,048 bits.
* InnoDB: On Unix-like platforms, os_file_create_simple_no_error_handling_func and os_file_create_func opened files in different modes when innodb_flush_method was set to O_DIRECT.
* InnoDB: An assertion was raised when InnoDB attempted to dereference a NULL foreign key object.
* InnoDB: An index record was not found on rollback due to inconsistencies in the purge_node_t structure.
* The Spencer regex library used for the REGEXP operator could be subject to heap overflow in some circumstances.
* A buffer-overflow error could occur for mysqlslap during option parsing.
* GROUP BY or ORDER BY on a CHAR(0) NOT NULL column could lead to a server exit.
* mysql-systemd-start failed if datadir was set in /etc/my.cnf.
* On OS X 10.10 (Yosemite), mysqld failed to start automatically. The startup item has been replaced with a launchd job, which enables the preference pane checkbox for automatic startup to work again.

5 files changed, 21 insertions, 18 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index f8d530dc366..cb2d5074c33 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2015/06/12 10:48:36 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/07/30 14:36:34 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 f855a50bfb4..fcc982fec19 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.45 2015/06/22 15:16:24 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.46 2015/07/30 14:36:34 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.44
+DISTNAME=	mysql-5.5.45
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 8a8b09e604c..c4922bb482e 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.43 2015/06/01 07:40:36 adam Exp $
+$NetBSD: distinfo,v 1.44 2015/07/30 14:36:34 adam Exp $
 
-SHA1 (mysql-5.5.44.tar.gz) = 1882c53d078ffb2e50339a8d9f5ba44c3eb155ea
-RMD160 (mysql-5.5.44.tar.gz) = 72faecbd2cae73ac109253e4a512086e74058128
-Size (mysql-5.5.44.tar.gz) = 21789766 bytes
-SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
-RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
-Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
+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 (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 7a4c1772fe0..ab97e758b3b 100644
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/02/07 16:04:46 fhajny Exp $
+# $NetBSD: options.mk,v 1.9 2015/07/30 14:36:34 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.7
+SPHINX_VER=	2.2.9
 DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-SITES.sphinx-2.2.7-release.tar.gz=	http://sphinxsearch.com/files/
+SITES.sphinx-2.2.9-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 29f5a590b54..134cecfb13c 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2015/06/01 07:40:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2015/07/30 14:36:34 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1003,7 +1003,6 @@ share/mysql/test/r/merge-big.result
 share/mysql/test/r/merge.result
 share/mysql/test/r/merge_innodb.result
 share/mysql/test/r/merge_mmap.result
-share/mysql/test/r/merge_recover.result
 share/mysql/test/r/metadata.result
 share/mysql/test/r/mix2_myisam.result
 share/mysql/test/r/mix2_myisam_ucs2.result
@@ -1017,6 +1016,7 @@ share/mysql/test/r/myisam-system.result
 share/mysql/test/r/myisam.result
 share/mysql/test/r/myisam_crash_before_flush_keys.result
 share/mysql/test/r/myisam_debug.result
+share/mysql/test/r/myisam_recover.result
 share/mysql/test/r/myisampack.result
 share/mysql/test/r/mysql-bug41486.result
 share/mysql/test/r/mysql-bug45236.result
@@ -2904,6 +2904,7 @@ share/mysql/test/suite/funcs_2/t/innodb_charset.test
 share/mysql/test/suite/funcs_2/t/memory_charset.test
 share/mysql/test/suite/funcs_2/t/myisam_charset.test
 share/mysql/test/suite/funcs_2/t/suite.opt
+share/mysql/test/suite/innodb/r/add_constraint.result
 share/mysql/test/suite/innodb/r/blob-update-debug.result
 share/mysql/test/suite/innodb/r/create-index.result
 share/mysql/test/suite/innodb/r/foreign-keys.result
@@ -3009,6 +3010,7 @@ share/mysql/test/suite/innodb/r/insert_debug.result
 share/mysql/test/suite/innodb/r/sp_temp_table.result
 share/mysql/test/suite/innodb/r/strict_mode.result
 share/mysql/test/suite/innodb/r/xa_recovery.result
+share/mysql/test/suite/innodb/t/add_constraint.test
 share/mysql/test/suite/innodb/t/blob-update-debug.test
 share/mysql/test/suite/innodb/t/create-index.test
 share/mysql/test/suite/innodb/t/disabled.def
@@ -3415,6 +3417,8 @@ share/mysql/test/suite/large_tests/t/rpl_slave_net_timeout.test
 share/mysql/test/suite/manual/r/rpl_replication_delay.result
 share/mysql/test/suite/manual/t/rpl_replication_delay-slave.opt
 share/mysql/test/suite/manual/t/rpl_replication_delay.test
+share/mysql/test/suite/ndb/r/ndb_restore_discover.result
+share/mysql/test/suite/ndb/t/ndb_restore_discover.test
 share/mysql/test/suite/parts/inc/methods1.inc
 share/mysql/test/suite/parts/inc/part_blocked_sql_funcs_main.inc
 share/mysql/test/suite/parts/inc/part_supported_sql_funcs_delete.inc
@@ -5970,8 +5974,6 @@ share/mysql/test/t/merge.test
 share/mysql/test/t/merge_innodb.test
 share/mysql/test/t/merge_mmap-master.opt
 share/mysql/test/t/merge_mmap.test
-share/mysql/test/t/merge_recover-master.opt
-share/mysql/test/t/merge_recover.test
 share/mysql/test/t/metadata.test
 share/mysql/test/t/mix2_myisam.test
 share/mysql/test/t/mix2_myisam_ucs2.test
@@ -5991,6 +5993,8 @@ share/mysql/test/t/myisam.test
 share/mysql/test/t/myisam_crash_before_flush_keys-master.opt
 share/mysql/test/t/myisam_crash_before_flush_keys.test
 share/mysql/test/t/myisam_debug.test
+share/mysql/test/t/myisam_recover-master.opt
+share/mysql/test/t/myisam_recover.test
 share/mysql/test/t/myisampack.test
 share/mysql/test/t/mysql-bug41486.test
 share/mysql/test/t/mysql-bug45236.test