Changes 5.5.40:

InnoDB: An ALTER TABLE ... ADD FOREIGN KEY operation could cause a serious error.
InnoDB: With a transaction isolation level less than or equal to READ COMMITTED, gap locks were not taken when scanning a unique secondary index to check for duplicates. As a result, duplicate check logic failed allowing duplicate key values in the unique secondary index.
InnoDB: During recovery, a segmentation fault would occur when marking a table as corrupt.
yaSSL client code did not validate the encryption size or session ID length, which could cause the client to exit.
MySQL installation from RPM packages could fail if Postfix had been installed using yum.
yaSSL could fail preauthorization if the client supplied inaccurate buffer lengths.
Competition between threads could lead to timeout failure trying to rotate the audit log file.
On Linux (OEL6), if Sun DTrace was installed, the MySQL build failed.
LPAD() and RPAD() could cause a server exit if the pad string argument was not well formed.
The optimizer could create a zero-length column for a temporary table, causing a server exit.

3 files changed, 6 insertions, 28 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index dde0585c9be..4e76e5aeb0c 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.39 2014/08/10 14:27:40 adam Exp $
+# $NetBSD: Makefile.common,v 1.40 2014/10/01 09:17:18 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.39
+DISTNAME=	mysql-5.5.40
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index a22a7031956..5c679daa891 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2014/08/10 14:27:40 adam Exp $
+$NetBSD: distinfo,v 1.36 2014/10/01 09:17:18 adam Exp $
 
-SHA1 (mysql-5.5.39.tar.gz) = 718c8a29fb28a2cd9387d9030370415a662aac58
-RMD160 (mysql-5.5.39.tar.gz) = e0f076ad74dffa9b5c416958eab08246771a4ed4
-Size (mysql-5.5.39.tar.gz) = 21713567 bytes
+SHA1 (mysql-5.5.40.tar.gz) = b93a1b14ab2de390014e99b4293e7835da133196
+RMD160 (mysql-5.5.40.tar.gz) = a0b6b9a390ba8a3abc889155d756656b28b98f70
+Size (mysql-5.5.40.tar.gz) = 21727672 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 632e036cd9578d0636328c2259a8529c36f2d14a
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
@@ -10,7 +10,6 @@ SHA1 (patch-client_mysqladmin.cc) = c640d3ca742dc1b200701d21d82d8f2093917cf2
 SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
 SHA1 (patch-client_mysqlshow.c) = a12b06241eee91d1ec11e3b7e4f3125aa6c79905
 SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600
-SHA1 (patch-cmake_dtrace.cmake) = 5ae3284589a17a8375b8a546136965fa337f3767
 SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
 SHA1 (patch-cmake_plugin.cmake) = 2b702af6bf8f251886cea12cf7477abae7659230
 SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d
diff --git a/databases/mysql55-client/patches/patch-cmake_dtrace.cmake b/databases/mysql55-client/patches/patch-cmake_dtrace.cmake
deleted file mode 100644
index 4e2029c1202..00000000000
--- a/databases/mysql55-client/patches/patch-cmake_dtrace.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-cmake_dtrace.cmake,v 1.1 2014/02/13 15:47:15 jperkin Exp $
-
-Build with newer DTrace.
-
---- cmake/dtrace.cmake.orig	2014-01-14 08:16:26.000000000 +0000
-+++ cmake/dtrace.cmake
-@@ -35,10 +35,11 @@ MACRO(CHECK_DTRACE)
-  MARK_AS_ADVANCED(DTRACE)
- 
-  # On FreeBSD, dtrace does not handle userland tracing yet
-- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
--     AND NOT BUGGY_GCC_NO_DTRACE_MODULES)
--   SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
-+ IF(ENABLE_DTRACE AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
-+    OR BUGGY_GCC_NO_DTRACE_MODULES OR NOT DTRACE))
-+  MESSAGE(FATAL_ERROR "dtrace is not supported on this system")
-  ENDIF()
-+
-  SET(HAVE_DTRACE ${ENABLE_DTRACE})
-  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)