Changes 5.6.20:

Security Fix: The linked OpenSSL library for the MySQL 5.6 Commercial Server has been updated from version 1.0.1g to version 1.0.1h. Versions of OpenSSL prior to and including 1.0.1g are reported to be vulnerable to CVE-2014-0224.

This change does not affect the Oracle-produced MySQL Community build of MySQL Server 5.6, which uses the yaSSL library instead.

DTrace Support

MySQL now includes DTrace support on Oracle Linux 6 or higher with UEK kernel. If DTrace is present, server builds will detect it with no special CMake options required. For information about using DTrace on MySQL, see Tracing mysqld Using DTrace.

InnoDB Notes

Important Change: Redo log writes for large, externally stored BLOB fields could overwrite the most recent checkpoint. The 5.6.20 patch limits the size of redo log BLOB writes to 10% of the redo log file size. The 5.7.5 patch addresses the bug without imposing a limitation. For MySQL 5.5, the bug remains a known limitation.

As a result of the redo log BLOB write limit introduced for MySQL 5.6, innodb_log_file_size should be set to a value greater than 10 times the largest BLOB data size found in the rows of your tables plus the length of other variable length fields (VARCHAR, VARBINARY, and TEXT type fields). Failing to do so could result in “Row size too large” errors. No action is required if your innodb_log_file_size setting is already sufficiently large or your tables contain no BLOB data.

Functionality Added or Changed

Replication: The new system variable binlog_impossible_mode controls what happens if the server cannot write to the binary log, for example, due to a file error. For backward compatibility, the default for binlog_impossible_mode is IGNORE_ERROR, meaning the server logs the error, halts logging, and continues updates to the database. Setting this variable to ABORT_SERVER makes the server halt logging and shut down if it cannot write to the binary log.

CMake support was updated to handle CMake version 3.

New Debian7, Ubuntu12.04, and Ubuntu14.04 distribution support that was introduced with 5.6.17 now comes with the platform-specific packaging source placed under the packaging directory, in the deb-precise, deb-wheezy, and deb-trusty directories.

Support for LinuxThreads has been removed from the source code. LinuxThreads was superseded by NPTL in Linux 2.6.

By default, mysql_install_db creates a my.cnf file in the installation base directory using a template. This may be undesireable for some deployments. To enable this behavior to be suppressed, mysql_install_db now supports a --keep-my-cnf option to preserve any existing my.cnf file and not create a new my.cnf file.

The mysqlhotcopy utility is now deprecated and will be removed in a future version of MySQL. Among the reasons for this: It works only for the MyISAM and ARCHIVE storage engines; it works on Unix but not Windows. Alternatives include mysqldump and MySQL Enterprise Backup.

The timed_mutexes system variable has no effect and is deprecated.

Bugs Fixed

5 files changed, 42 insertions, 40 deletions

diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index d00c7cd2c55..2f4c718e5fb 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.16 2014/06/02 07:30:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2014/08/10 15:11:57 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.19
+DISTNAME=	mysql-5.6.20
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index aaddf2d32ca..09044ed6524 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.15 2014/06/02 07:30:38 adam Exp $
+$NetBSD: distinfo,v 1.16 2014/08/10 15:11:57 adam Exp $
 
-SHA1 (mysql-5.6.19.tar.gz) = 4b59d96642c62c26648826ea4f9c30dbf123dbed
-RMD160 (mysql-5.6.19.tar.gz) = 3cc8acbef87c98f5221307f9b8351bd7d2f7f7e3
-Size (mysql-5.6.19.tar.gz) = 32879525 bytes
-SHA1 (patch-CMakeLists.txt) = b3d0bfc9a23ddbb1ea415e16c35c86e190857bba
+SHA1 (mysql-5.6.20.tar.gz) = 10f9ed2bbf3fbf227b799f1c7af3a0c7f7cf4d95
+RMD160 (mysql-5.6.20.tar.gz) = 8610331ef74391f75ee48808219e58ebfa092ca2
+Size (mysql-5.6.20.tar.gz) = 32979820 bytes
+SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
-SHA1 (patch-cmake_dtrace.cmake) = e54867464be28ec05534c9b3c38fd54533f652fb
+SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
 SHA1 (patch-cmake_readline.cmake) = f1ec8ccbebb5b7851199bec457d4029c8a9e63dc
@@ -19,7 +19,7 @@ SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd
 SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca
 SHA1 (patch-libmysql_CMakeLists.txt) = 229044de6d11b26ee99b25be99b628a9f146b795
 SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d
-SHA1 (patch-mysys__ssl_CMakeLists.txt) = 8393fba7e834a7d97103ef7fc3925d134e018fbb
+SHA1 (patch-mysys__ssl_CMakeLists.txt) = e50bad459520be78ea2d5c4d0699cda8c1141884
 SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e
 SHA1 (patch-scripts_CMakeLists.txt) = 3f4621b3256034c5a3114e98c108658794f06008
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
diff --git a/databases/mysql56-client/patches/patch-CMakeLists.txt b/databases/mysql56-client/patches/patch-CMakeLists.txt
index fbd9d7e96b6..cd2f38892fb 100644
--- a/databases/mysql56-client/patches/patch-CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2014/02/13 14:38:08 jperkin Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2014/08/10 15:11:57 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 Build with newer DTrace.
 
---- CMakeLists.txt.orig	2013-11-17 18:02:53.000000000 +0000
+--- CMakeLists.txt.orig	2014-07-18 15:48:39.000000000 +0000
 +++ CMakeLists.txt
-@@ -205,6 +205,7 @@ IF(DISABLE_SHARED)
+@@ -215,6 +215,7 @@ IF(DISABLE_SHARED)
    SET(WITHOUT_DYNAMIC_PLUGINS 1)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
@@ -13,7 +13,7 @@ Build with newer DTrace.
  OPTION(CYBOZU "" OFF)
  OPTION(BACKUP_TEST "" OFF)
  OPTION(WITHOUT_SERVER OFF)
-@@ -443,7 +443,6 @@ ADD_SUBDIRECTORY(vio)
+@@ -472,7 +473,6 @@ ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(regex)
  ADD_SUBDIRECTORY(mysys)
  ADD_SUBDIRECTORY(mysys_ssl)
@@ -21,31 +21,33 @@ Build with newer DTrace.
  
  IF(WITH_UNIT_TESTS)
    ADD_SUBDIRECTORY(unittest)
-@@ -458,9 +457,13 @@ IF(WITH_UNIT_TESTS)
+@@ -491,16 +491,16 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
--IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
+-ADD_SUBDIRECTORY(client)
+ ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(libservices)
+ 
+-IF(UNIX)
 +IF(WITHOUT_SERVER)
 +  ADD_SUBDIRECTORY(libmysql)
-   ADD_SUBDIRECTORY(client)
++  ADD_SUBDIRECTORY(client)
 +  ADD_SUBDIRECTORY(scripts)
-+  ADD_SUBDIRECTORY(man)
-+  ADD_SUBDIRECTORY(tests)
+   ADD_SUBDIRECTORY(man)
+-ENDIF()
+-
+-IF(NOT WITHOUT_SERVER)
+   ADD_SUBDIRECTORY(tests)
 +ELSE()
    ADD_SUBDIRECTORY(sql)
-   ADD_SUBDIRECTORY(sql/share)
-   ADD_SUBDIRECTORY(libservices)
-@@ -473,11 +476,7 @@ IF(NOT WITHOUT_SERVER)
+   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+   IF(WITH_EMBEDDED_SERVER) 
+@@ -511,7 +511,6 @@ ENDIF()
+ 
+ # scripts/mysql_config depends on client and server targets loaded above.
+ # It is referenced by some of the directories below, so we insert it here.
+-ADD_SUBDIRECTORY(scripts)
+ 
+ IF(NOT WITHOUT_SERVER)
    ADD_SUBDIRECTORY(mysql-test)
-   ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
--  ADD_SUBDIRECTORY(scripts)
-   ADD_SUBDIRECTORY(sql-bench)
--  IF(UNIX)
--    ADD_SUBDIRECTORY(man)
--  ENDIF()
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-   ENDIF()
diff --git a/databases/mysql56-client/patches/patch-cmake_dtrace.cmake b/databases/mysql56-client/patches/patch-cmake_dtrace.cmake
index b37e214c23d..538b24090af 100644
--- a/databases/mysql56-client/patches/patch-cmake_dtrace.cmake
+++ b/databases/mysql56-client/patches/patch-cmake_dtrace.cmake
@@ -1,8 +1,8 @@
-$NetBSD: patch-cmake_dtrace.cmake,v 1.1 2014/02/13 14:38:08 jperkin Exp $
+$NetBSD: patch-cmake_dtrace.cmake,v 1.2 2014/08/10 15:11:57 adam Exp $
 
 Build with newer DTrace.
 
---- cmake/dtrace.cmake.orig	2013-11-17 18:02:53.000000000 +0000
+--- cmake/dtrace.cmake.orig	2014-07-18 15:48:39.000000000 +0000
 +++ cmake/dtrace.cmake
 @@ -35,10 +35,11 @@ MACRO(CHECK_DTRACE)
   MARK_AS_ADVANCED(DTRACE)
@@ -17,5 +17,5 @@ Build with newer DTrace.
   ENDIF()
 +
   SET(HAVE_DTRACE ${ENABLE_DTRACE})
-  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  EXECUTE_PROCESS(
+    COMMAND ${DTRACE} -V
diff --git a/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt b/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt
index 421ab7f6a94..3ce45bb6ef9 100644
--- a/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt
@@ -1,14 +1,14 @@
-$NetBSD: patch-mysys__ssl_CMakeLists.txt,v 1.1 2014/02/13 14:38:08 jperkin Exp $
+$NetBSD: patch-mysys__ssl_CMakeLists.txt,v 1.2 2014/08/10 15:11:57 adam Exp $
 
 Build with newer DTrace.
 
---- mysys_ssl/CMakeLists.txt.orig	2013-11-17 18:02:53.000000000 +0000
+--- mysys_ssl/CMakeLists.txt.orig	2014-07-18 15:48:39.000000000 +0000
 +++ mysys_ssl/CMakeLists.txt
-@@ -48,7 +48,6 @@ SET(MYSYS_SSL_SOURCES
+@@ -60,7 +60,6 @@ SET(MYSYS_SSL_SOURCES
  
  ADD_CONVENIENCE_LIBRARY(mysys_ssl ${MYSYS_SSL_SOURCES})
  TARGET_LINK_LIBRARIES(mysys_ssl dbug strings ${SSL_LIBRARIES} ${ZLIB_LIBRARY})
 -DTRACE_INSTRUMENT(mysys_ssl)
  
- INSTALL_DEBUG_SYMBOLS(mysys_ssl)
  IF(MSVC)
+    INSTALL_DEBUG_TARGET(mysys_ssl DESTINATION ${INSTALL_LIBDIR}/debug)