Changes 5.6.11:

Replication: The functions GTID_SUBTRACT() and GTID_SUBSET() were formerly available in libmysqld only when it was built with replication support. Now these functions are always available when using this library, regardless of how it was built.

MySQL no longer uses the default OpenSSL compression.

There is now a distinct error code (ER_MUST_CHANGE_PASSWORD_LOGIN) for the error sent by the server to a client authenticating with an expired password.

mysql_config_editor now supports --port and --socket options for specifying TCP/IP port number and Unix socket file name.

mysqlcheck has a new --skip-database option. The option value is the name of a database (case sensitive) for which checks should be skipped.

mysql_upgrade uses this option to upgrade the system tables in the mysql database before tables in other databases: It upgrade the mysql database, then all databases except the mysql database. This avoids problems that can occur if user tables are upgraded before the system tables.

The only supported value for the innodb_mirrored_log_groups system variable is 1, so this variable is now deprecated. Setting it to 1 at startup results in a warning. Setting it to a value other than 1 at startup results in an error and the server exits. This variable will be removed in a future release.

9 files changed, 136 insertions, 77 deletions

diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index 146db4f896b..7c952043325 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2013/03/06 10:03:13 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.4 2013/04/20 08:06:01 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.10
+DISTNAME=	mysql-5.6.11
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 679a4c5b24a..728a92cb530 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.1 2013/02/13 21:00:02 adam Exp $
+$NetBSD: distinfo,v 1.2 2013/04/20 08:06:01 adam Exp $
 
-SHA1 (mysql-5.6.10.tar.gz) = f37979eafc241a0ebeac9548cb3f4113074271b7
-RMD160 (mysql-5.6.10.tar.gz) = b90ec96435ec9cdb61c8c7f8d0c1c8b1f45b0919
-Size (mysql-5.6.10.tar.gz) = 35174149 bytes
+SHA1 (mysql-5.6.11.tar.gz) = 31df6950a9dbf4fcc45f62f44f4dee96ec5b3193
+RMD160 (mysql-5.6.11.tar.gz) = acd671ace63cab1ffc442dd7e3ffa10ff9fb4659
+Size (mysql-5.6.11.tar.gz) = 35458544 bytes
 SHA1 (patch-CMakeLists.txt) = 1889afcd79a271d3f9ac0e234c449ef6aa8ca818
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
-SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
-SHA1 (patch-cmake_ssl.cmake) = 305dafd7762f53f01a4addec48e56fa66cd15f77
+SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
+SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
 SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
 SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd
@@ -18,10 +18,10 @@ SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9
 SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e
 SHA1 (patch-scripts_CMakeLists.txt) = 3f4621b3256034c5a3114e98c108658794f06008
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
-SHA1 (patch-sql_CMakeLists.txt) = 40fa474da4cfd95be7247536a4efa7c7d85214a2
-SHA1 (patch-sql_log_event.h) = a584496c5f841a06d7161da0ae7ba620f135beed
-SHA1 (patch-sql_mysqld.cc) = e2a3f6a4053bf60230614e9d8c279949199d75e3
+SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5
+SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e
+SHA1 (patch-sql_mysqld.cc) = 84e5e72e5f7c199bb15075549514df02a1ac61a1
 SHA1 (patch-sql_sql_string.h) = bbb52320709f06ab8fb9f680f6bbba45ea8a00f5
 SHA1 (patch-storage_ndb_include_util_Parser.hpp) = 037fc153619bf79ee95cb03a5ac4a71c14952c3a
-SHA1 (patch-storage_perfschema_unittest_CMakeLists.txt) = 88611574e6bdc0f365c9d8dccf19488eec298f97
 SHA1 (patch-strings_decimal.c) = 4d2a3d8acb3b0af56180f3a1faa8735d692be5b9
+SHA1 (patch-vio_viossl.c) = 81f1386cd719d87c02ecf4fc47b1f7bb6e6ea389
diff --git a/databases/mysql56-client/patches/patch-cmake_libutils.cmake b/databases/mysql56-client/patches/patch-cmake_libutils.cmake
index 56ff35a0afa..71ab183b09e 100644
--- a/databases/mysql56-client/patches/patch-cmake_libutils.cmake
+++ b/databases/mysql56-client/patches/patch-cmake_libutils.cmake
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmake_libutils.cmake,v 1.1 2013/02/13 21:00:04 adam Exp $
+$NetBSD: patch-cmake_libutils.cmake,v 1.2 2013/04/20 08:06:01 adam Exp $
 
 On Mac OS X, use PkgSrc libtool.
 
 --- cmake/libutils.cmake.orig	2011-04-05 12:38:41.000000000 +0000
 +++ cmake/libutils.cmake
-@@ -178,7 +178,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NA
+@@ -179,7 +179,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NA
        "${LINKER_EXTRA_FLAGS}")
    ELSE()
      GET_TARGET_PROPERTY(TARGET_LOCATION ${TARGET} LOCATION)  
diff --git a/databases/mysql56-client/patches/patch-cmake_ssl.cmake b/databases/mysql56-client/patches/patch-cmake_ssl.cmake
index 4e3e5e31f0f..0cc005ee707 100644
--- a/databases/mysql56-client/patches/patch-cmake_ssl.cmake
+++ b/databases/mysql56-client/patches/patch-cmake_ssl.cmake
@@ -1,23 +1,24 @@
-$NetBSD: patch-cmake_ssl.cmake,v 1.1 2013/02/13 21:00:04 adam Exp $
+$NetBSD: patch-cmake_ssl.cmake,v 1.2 2013/04/20 08:06:01 adam Exp $
 
 Allow OpenSSH versions below 1.0.
 Do not prefer static libraries (or linking will fail).
 
---- cmake/ssl.cmake.orig	2013-02-12 13:35:25.000000000 +0000
+--- cmake/ssl.cmake.orig	2013-04-05 12:27:18.000000000 +0000
 +++ cmake/ssl.cmake
-@@ -139,8 +139,6 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -143,9 +143,7 @@ MACRO (MYSQL_CHECK_SSL)
      ENDIF()
  
      # On mac this list is <.dylib;.so;.a>
 -    # We prefer static libraries, so we revert it here.
--    LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-     MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
-     FIND_LIBRARY(OPENSSL_LIBRARIES
-                  NAMES ssl ssleay32 ssleay32MD
-@@ -164,8 +162,7 @@ MACRO (MYSQL_CHECK_SSL)
+     IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+       MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
+     ENDIF()
+     FIND_LIBRARY(OPENSSL_LIBRARY
+@@ -172,8 +170,7 @@ MACRO (MYSQL_CHECK_SSL)
  
      IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARIES   AND
+        OPENSSL_LIBRARY   AND
 -       CRYPTO_LIBRARY      AND
 -       OPENSSL_MAJOR_VERSION STREQUAL "1"
 +       CRYPTO_LIBRARY
diff --git a/databases/mysql56-client/patches/patch-sql_CMakeLists.txt b/databases/mysql56-client/patches/patch-sql_CMakeLists.txt
index 519165413e0..d1e6ad7c75f 100644
--- a/databases/mysql56-client/patches/patch-sql_CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-sql_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-sql_CMakeLists.txt,v 1.1 2013/02/13 21:00:07 adam Exp $
+$NetBSD: patch-sql_CMakeLists.txt,v 1.2 2013/04/20 08:06:01 adam Exp $
 
 Do not install files in MYSQL_DATADIR.
 
---- sql/CMakeLists.txt.orig	2011-04-25 19:03:50.000000000 +0000
+--- sql/CMakeLists.txt.orig	2013-04-05 12:27:18.000000000 +0000
 +++ sql/CMakeLists.txt
 @@ -421,7 +421,7 @@ ADD_CUSTOM_TARGET(distclean
    VERBATIM
@@ -11,5 +11,5 @@ Do not install files in MYSQL_DATADIR.
 -IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
 +IF(FALSE)
  
- # We need to create empty directories (data/test) the installation.  
- # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
+ # Copy db.opt into data/test/
+ SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
diff --git a/databases/mysql56-client/patches/patch-sql_log_event.h b/databases/mysql56-client/patches/patch-sql_log_event.h
index ad703d3fb2a..1cf15079d5c 100644
--- a/databases/mysql56-client/patches/patch-sql_log_event.h
+++ b/databases/mysql56-client/patches/patch-sql_log_event.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-sql_log_event.h,v 1.1 2013/02/13 21:00:07 adam Exp $
+$NetBSD: patch-sql_log_event.h,v 1.2 2013/04/20 08:06:01 adam Exp $
 
 * Portability: include <bstring.h> if exists.
 
---- sql/log_event.h.orig	2013-01-22 16:54:50.000000000 +0000
+--- sql/log_event.h.orig	2013-04-05 12:27:18.000000000 +0000
 +++ sql/log_event.h
 @@ -28,6 +28,10 @@
  #ifndef _log_event_h
@@ -14,4 +14,4 @@ $NetBSD: patch-sql_log_event.h,v 1.1 2013/02/13 21:00:07 adam Exp $
 +
  #include <my_bitmap.h>
  #include "rpl_constants.h"
- 
+ #include "table_id.h"
diff --git a/databases/mysql56-client/patches/patch-sql_mysqld.cc b/databases/mysql56-client/patches/patch-sql_mysqld.cc
index dde6ee0cab9..c5a171e7394 100644
--- a/databases/mysql56-client/patches/patch-sql_mysqld.cc
+++ b/databases/mysql56-client/patches/patch-sql_mysqld.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.1 2013/02/13 21:00:07 adam Exp $
+$NetBSD: patch-sql_mysqld.cc,v 1.2 2013/04/20 08:06:01 adam Exp $
 
 --- sql/mysqld.cc.orig	2013-01-22 16:54:50.000000000 +0000
 +++ sql/mysqld.cc
@@ -20,12 +20,3 @@ $NetBSD: patch-sql_mysqld.cc,v 1.1 2013/02/13 21:00:07 adam Exp $
    /* We can't handle floating point exceptions with threads, so disable
       this on freebsd
       Don't fall for overflow, underflow,divide-by-zero or loss of precision.
-@@ -6292,7 +6292,7 @@ void handle_connections_sockets()
-             The connection was refused by TCP wrappers.
-             There are no details (by client IP) available to update the host_cache.
-           */
--          statistic_increment(connection_tcpwrap_errors, &LOCK_status);
-+          statistic_increment(connection_errors_tcpwrap, &LOCK_status);
-           continue;
-         }
-       }
diff --git a/databases/mysql56-client/patches/patch-storage_perfschema_unittest_CMakeLists.txt b/databases/mysql56-client/patches/patch-storage_perfschema_unittest_CMakeLists.txt
deleted file mode 100644
index 11ab9f44dea..00000000000
--- a/databases/mysql56-client/patches/patch-storage_perfschema_unittest_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-storage_perfschema_unittest_CMakeLists.txt,v 1.1 2013/02/13 21:00:08 adam Exp $
-
-There is no libzlib, but libz.
-
---- storage/perfschema/unittest/CMakeLists.txt.orig	2013-02-12 19:03:35.000000000 +0000
-+++ storage/perfschema/unittest/CMakeLists.txt
-@@ -63,7 +63,7 @@ TARGET_LINK_LIBRARIES(pfs_connect_attr-t
- TARGET_LINK_LIBRARIES(pfs_connect_attr-t sql binlog rpl master slave sql)
- TARGET_LINK_LIBRARIES(pfs_connect_attr-t mysys mysys_ssl)
- TARGET_LINK_LIBRARIES(pfs_connect_attr-t vio ${SSL_LIBRARIES})
--TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys zlib)
-+TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys)
- ADD_TEST(pfs_connect_attr pfs_connect_attr-t)
- 
- # On windows, pfs_connect_attr-t may depend on openssl dlls.
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index dceb39d0695..43a177cfbe9 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/02/13 21:00:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/20 08:06:01 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -196,7 +196,11 @@ share/mysql/test/collections/disabled-per-push.list
 share/mysql/test/collections/disabled-weekly.list
 share/mysql/test/extra/binlog_tests/binlog.test
 share/mysql/test/extra/binlog_tests/binlog_cache_stat.test
+share/mysql/test/extra/binlog_tests/binlog_implicit_commit.inc
+share/mysql/test/extra/binlog_tests/binlog_innodb.inc
 share/mysql/test/extra/binlog_tests/binlog_insert_delayed.test
+share/mysql/test/extra/binlog_tests/binlog_mysqlbinlog_row.inc
+share/mysql/test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc
 share/mysql/test/extra/binlog_tests/binlog_truncate.test
 share/mysql/test/extra/binlog_tests/blackhole.test
 share/mysql/test/extra/binlog_tests/ctype_cp932.test
@@ -561,6 +565,7 @@ share/mysql/test/include/not_openssl.inc
 share/mysql/test/include/not_parallel.inc
 share/mysql/test/include/not_relay_log_info_table.inc
 share/mysql/test/include/not_sha256_rsa_auth.inc
+share/mysql/test/include/not_ssl.inc
 share/mysql/test/include/not_threadpool.inc
 share/mysql/test/include/not_valgrind.inc
 share/mysql/test/include/not_var_link.inc
@@ -595,7 +600,6 @@ share/mysql/test/include/report-features.test
 share/mysql/test/include/restart_mysqld.inc
 share/mysql/test/include/restart_slave_sql.inc
 share/mysql/test/include/rowid_order.inc
-share/mysql/test/include/rpl_assert.inc
 share/mysql/test/include/rpl_change_topology.inc
 share/mysql/test/include/rpl_connect.inc
 share/mysql/test/include/rpl_connection.inc
@@ -1259,6 +1263,7 @@ share/mysql/test/r/not_embedded_server.result
 share/mysql/test/r/not_ndb.require
 share/mysql/test/r/not_openssl.require
 share/mysql/test/r/not_partition.result
+share/mysql/test/r/not_ssl.require
 share/mysql/test/r/not_true.require
 share/mysql/test/r/not_valgrind.require
 share/mysql/test/r/not_windows.require
@@ -1456,6 +1461,7 @@ share/mysql/test/r/sp_validation.result
 share/mysql/test/r/sql_mode.result
 share/mysql/test/r/ssl-big.result
 share/mysql/test/r/ssl-crl-revoked-crl.result
+share/mysql/test/r/ssl-sha512.result
 share/mysql/test/r/ssl.result
 share/mysql/test/r/ssl_8k_key.result
 share/mysql/test/r/ssl_and_innodb.result
@@ -1570,6 +1576,7 @@ share/mysql/test/r/type_temporal_fractional.result
 share/mysql/test/r/type_temporal_upgrade.result
 share/mysql/test/r/type_time.result
 share/mysql/test/r/type_timestamp.result
+share/mysql/test/r/type_timestamp_explicit.result
 share/mysql/test/r/type_uint.result
 share/mysql/test/r/type_varchar.result
 share/mysql/test/r/type_year.result
@@ -1640,7 +1647,6 @@ share/mysql/test/std_data/bug46565.frm
 share/mysql/test/std_data/bug47012.ARM
 share/mysql/test/std_data/bug47012.ARZ
 share/mysql/test/std_data/bug47012.frm
-share/mysql/test/std_data/bug47142_master-bin.000001
 share/mysql/test/std_data/bug47205.frm
 share/mysql/test/std_data/bug48265.frm
 share/mysql/test/std_data/bug48449.frm
@@ -1650,6 +1656,7 @@ share/mysql/test/std_data/bug48633.frm
 share/mysql/test/std_data/bug49823.CSM
 share/mysql/test/std_data/bug49823.CSV
 share/mysql/test/std_data/bug49823.frm
+share/mysql/test/std_data/ca-sha512.pem
 share/mysql/test/std_data/cacert.pem
 share/mysql/test/std_data/charset_utf8.txt
 share/mysql/test/std_data/checkDBI_DBD-mysql.pl
@@ -1738,7 +1745,9 @@ share/mysql/test/std_data/rpl_timezone.dat
 share/mysql/test/std_data/rpl_timezone2.dat
 share/mysql/test/std_data/rsa_private_key.pem
 share/mysql/test/std_data/rsa_public_key.pem
+share/mysql/test/std_data/server-cert-sha512.pem
 share/mysql/test/std_data/server-cert.pem
+share/mysql/test/std_data/server-key-sha512.pem
 share/mysql/test/std_data/server-key.pem
 share/mysql/test/std_data/server8k-cert.pem
 share/mysql/test/std_data/server8k-key.pem
@@ -1755,6 +1764,52 @@ share/mysql/test/std_data/wl6219_55.frm
 share/mysql/test/std_data/wl6219_55_innodb.frm
 share/mysql/test/std_data/words.dat
 share/mysql/test/std_data/words2.dat
+share/mysql/test/suite/auth_sec/include/have_openssl.inc
+share/mysql/test/suite/auth_sec/include/have_sha256_rsa_auth.inc
+share/mysql/test/suite/auth_sec/include/have_ssl.inc
+share/mysql/test/suite/auth_sec/include/have_ssl_communication.inc
+share/mysql/test/suite/auth_sec/include/mysql_upgrade_preparation.inc
+share/mysql/test/suite/auth_sec/include/not_embedded.inc
+share/mysql/test/suite/auth_sec/include/not_openssl.inc
+share/mysql/test/suite/auth_sec/include/not_sha256_rsa_auth.inc
+share/mysql/test/suite/auth_sec/include/not_ssl.inc
+share/mysql/test/suite/auth_sec/r/access_credential_control.result
+share/mysql/test/suite/auth_sec/r/have_mysql_upgrade.result
+share/mysql/test/suite/auth_sec/r/have_ssl.require
+share/mysql/test/suite/auth_sec/r/key_value_auth.result
+share/mysql/test/suite/auth_sec/r/mysql_native_plugin.result
+share/mysql/test/suite/auth_sec/r/mysql_old_passwords.result
+share/mysql/test/suite/auth_sec/r/mysql_old_plugin.result
+share/mysql/test/suite/auth_sec/r/mysql_sha256_plugin.result
+share/mysql/test/suite/auth_sec/r/not_embedded.require
+share/mysql/test/suite/auth_sec/r/not_openssl.require
+share/mysql/test/suite/auth_sec/r/not_ssl.require
+share/mysql/test/suite/auth_sec/r/openssl.require
+share/mysql/test/suite/auth_sec/r/password_expired.result
+share/mysql/test/suite/auth_sec/r/server_withoutssl_client_withoutssl.result
+share/mysql/test/suite/auth_sec/r/server_withoutssl_client_withssl.result
+share/mysql/test/suite/auth_sec/r/server_withssl_client_withoutssl.result
+share/mysql/test/suite/auth_sec/r/server_withssl_client_withssl.result
+share/mysql/test/suite/auth_sec/t/access_credential_control-master.opt
+share/mysql/test/suite/auth_sec/t/access_credential_control.test
+share/mysql/test/suite/auth_sec/t/key_value_auth-master.opt
+share/mysql/test/suite/auth_sec/t/key_value_auth.test
+share/mysql/test/suite/auth_sec/t/key_value_auth.test_old
+share/mysql/test/suite/auth_sec/t/mysql_native_plugin.test
+share/mysql/test/suite/auth_sec/t/mysql_old_passwords-master.opt
+share/mysql/test/suite/auth_sec/t/mysql_old_passwords.test
+share/mysql/test/suite/auth_sec/t/mysql_old_plugin.test
+share/mysql/test/suite/auth_sec/t/mysql_old_plugin.test_old
+share/mysql/test/suite/auth_sec/t/mysql_sha256_plugin-master.opt
+share/mysql/test/suite/auth_sec/t/mysql_sha256_plugin.test
+share/mysql/test/suite/auth_sec/t/password_expired-master.opt
+share/mysql/test/suite/auth_sec/t/password_expired.test
+share/mysql/test/suite/auth_sec/t/server_withoutssl_client_withoutssl.test
+share/mysql/test/suite/auth_sec/t/server_withoutssl_client_withssl.test
+share/mysql/test/suite/auth_sec/t/server_withssl_client_withoutssl-master.opt
+share/mysql/test/suite/auth_sec/t/server_withssl_client_withoutssl.test
+share/mysql/test/suite/auth_sec/t/server_withssl_client_withssl-master.opt
+share/mysql/test/suite/auth_sec/t/server_withssl_client_withssl.test
 share/mysql/test/suite/binlog/combinations
 share/mysql/test/suite/binlog/r/binlog_base64_flag.result
 share/mysql/test/suite/binlog/r/binlog_bug23533.result
@@ -1769,6 +1824,14 @@ share/mysql/test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
 share/mysql/test/suite/binlog/r/binlog_grant.result
 share/mysql/test/suite/binlog/r/binlog_gtid_cache.result
 share/mysql/test/suite/binlog/r/binlog_gtid_errors.result
+share/mysql/test/suite/binlog/r/binlog_gtid_implicit_commit.result
+share/mysql/test/suite/binlog/r/binlog_gtid_innodb.result
+share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_row.result
+share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_innodb.result
+share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result
+share/mysql/test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result
+share/mysql/test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result
+share/mysql/test/suite/binlog/r/binlog_gtid_stm_ctype_ucs.result
 share/mysql/test/suite/binlog/r/binlog_hexdump.result
 share/mysql/test/suite/binlog/r/binlog_implicit_commit.result
 share/mysql/test/suite/binlog/r/binlog_incident.result
@@ -1866,6 +1929,14 @@ share/mysql/test/suite/binlog/t/binlog_gtid_cache-master.opt
 share/mysql/test/suite/binlog/t/binlog_gtid_cache.test
 share/mysql/test/suite/binlog/t/binlog_gtid_errors-master.opt
 share/mysql/test/suite/binlog/t/binlog_gtid_errors.test
+share/mysql/test/suite/binlog/t/binlog_gtid_implicit_commit.test
+share/mysql/test/suite/binlog/t/binlog_gtid_innodb.test
+share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_row.test
+share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_innodb.test
+share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_myisam.test
+share/mysql/test/suite/binlog/t/binlog_gtid_mysqlbinlog_start_stop.test
+share/mysql/test/suite/binlog/t/binlog_gtid_row_ctype_ucs.test
+share/mysql/test/suite/binlog/t/binlog_gtid_stm_ctype_ucs.test
 share/mysql/test/suite/binlog/t/binlog_hexdump.test
 share/mysql/test/suite/binlog/t/binlog_implicit_commit.test
 share/mysql/test/suite/binlog/t/binlog_incident-master.opt
@@ -3246,7 +3317,7 @@ share/mysql/test/suite/funcs_2/t/myisam_charset.test
 share/mysql/test/suite/funcs_2/t/suite.opt
 share/mysql/test/suite/innodb/include/innodb_create_tab_indx.inc
 share/mysql/test/suite/innodb/include/innodb_dict.inc
-share/mysql/test/suite/innodb/include/innodb_fectch_records.inc
+share/mysql/test/suite/innodb/include/innodb_fetch_records.inc
 share/mysql/test/suite/innodb/include/innodb_load_data.inc
 share/mysql/test/suite/innodb/include/innodb_stats.inc
 share/mysql/test/suite/innodb/include/innodb_stats_comp_index.inc
@@ -3671,6 +3742,7 @@ share/mysql/test/suite/innodb_fts/r/innodb_fts_misc_debug.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_multiple_index.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_opt.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_proximity.result
+share/mysql/test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_transaction.result
 share/mysql/test/suite/innodb_fts/t/disabled.def
 share/mysql/test/suite/innodb_fts/t/fulltext.test
@@ -3697,6 +3769,7 @@ share/mysql/test/suite/innodb_fts/t/innodb_fts_misc_debug.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_multiple_index.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_opt.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_proximity.test
+share/mysql/test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_transaction.test
 share/mysql/test/suite/jp/include/trim_sjis.inc
 share/mysql/test/suite/jp/r/jp_alter_sjis.result
@@ -5978,9 +6051,6 @@ share/mysql/test/suite/rpl/r/rpl_mixed_ddl_dml.result
 share/mysql/test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
 share/mysql/test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
 share/mysql/test/suite/rpl/r/rpl_mixed_mixing_engines.result
-share/mysql/test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
-share/mysql/test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
-share/mysql/test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result
 share/mysql/test/suite/rpl/r/rpl_mixed_row_innodb.result
 share/mysql/test/suite/rpl/r/rpl_mts_debug.result
 share/mysql/test/suite/rpl/r/rpl_multi_delete.result
@@ -6178,9 +6248,11 @@ share/mysql/test/suite/rpl/r/rpl_stm_max_relay_size.result
 share/mysql/test/suite/rpl/r/rpl_stm_mix_mts_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
+share/mysql/test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result
+share/mysql/test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result
+share/mysql/test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result
+share/mysql/test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result
 share/mysql/test/suite/rpl/r/rpl_stm_mixing_engines.result
-share/mysql/test/suite/rpl/r/rpl_stm_mts_crash_safe.result
-share/mysql/test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
 share/mysql/test/suite/rpl/r/rpl_stm_multi_query.result
 share/mysql/test/suite/rpl/r/rpl_stm_no_op.result
 share/mysql/test/suite/rpl/r/rpl_stm_relay_ign_space.result
@@ -6467,13 +6539,6 @@ share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-master.opt
 share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
 share/mysql/test/suite/rpl/t/rpl_mixed_mixing_engines.test
-share/mysql/test/suite/rpl/t/rpl_mixed_mts_crash_safe-slave.opt
-share/mysql/test/suite/rpl/t/rpl_mixed_mts_crash_safe.test
-share/mysql/test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe-slave.opt
-share/mysql/test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test
-share/mysql/test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt
-share/mysql/test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt
-share/mysql/test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test
 share/mysql/test/suite/rpl/t/rpl_mixed_row_innodb-master.opt
 share/mysql/test/suite/rpl/t/rpl_mts_debug-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_debug.test
@@ -6763,11 +6828,16 @@ share/mysql/test/suite/rpl/t/rpl_stm_mix_mts_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_stm_mixed_crash_safe-slave.opt
 share/mysql/test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_crash_safe-slave.opt
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_crash_safe.test
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe-slave.opt
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe.test
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_checksum-master.opt
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_checksum-slave.opt
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_checksum.test
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_small-slave.opt
+share/mysql/test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_small.test
 share/mysql/test/suite/rpl/t/rpl_stm_mixing_engines.test
-share/mysql/test/suite/rpl/t/rpl_stm_mts_crash_safe-slave.opt
-share/mysql/test/suite/rpl/t/rpl_stm_mts_crash_safe.test
-share/mysql/test/suite/rpl/t/rpl_stm_mts_rec_crash_safe-slave.opt
-share/mysql/test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test
 share/mysql/test/suite/rpl/t/rpl_stm_multi_query.test
 share/mysql/test/suite/rpl/t/rpl_stm_no_op.test
 share/mysql/test/suite/rpl/t/rpl_stm_relay_ign_space-slave.opt
@@ -7021,7 +7091,6 @@ share/mysql/test/suite/sys_vars/r/group_concat_max_len_func.result
 share/mysql/test/suite/sys_vars/r/gtid_executed_basic.result
 share/mysql/test/suite/sys_vars/r/gtid_mode_basic.result
 share/mysql/test/suite/sys_vars/r/gtid_next_basic.result
-share/mysql/test/suite/sys_vars/r/gtid_next_list_basic.result
 share/mysql/test/suite/sys_vars/r/gtid_owned_basic.result
 share/mysql/test/suite/sys_vars/r/gtid_purged_basic.result
 share/mysql/test/suite/sys_vars/r/have_compress_basic.result
@@ -7058,6 +7127,7 @@ share/mysql/test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_evict_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_load_abort_basic.result
@@ -7112,6 +7182,7 @@ share/mysql/test/suite/sys_vars/r/innodb_limit_optimistic_insert_debug_basic.res
 share/mysql/test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_file_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_files_in_group_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
@@ -7213,6 +7284,9 @@ share/mysql/test/suite/sys_vars/r/log_output_basic.result
 share/mysql/test/suite/sys_vars/r/log_output_func.result
 share/mysql/test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
 share/mysql/test/suite/sys_vars/r/log_slave_updates_basic.result
+share/mysql/test/suite/sys_vars/r/log_slow_admin_statements_basic.result
+share/mysql/test/suite/sys_vars/r/log_slow_admin_statements_func.result
+share/mysql/test/suite/sys_vars/r/log_slow_slave_statements_basic.result
 share/mysql/test/suite/sys_vars/r/log_throttle_queries_not_using_indexes_basic.result
 share/mysql/test/suite/sys_vars/r/log_warnings_basic_32.result
 share/mysql/test/suite/sys_vars/r/log_warnings_basic_64.result
@@ -7607,7 +7681,6 @@ share/mysql/test/suite/sys_vars/t/group_concat_max_len_func.test
 share/mysql/test/suite/sys_vars/t/gtid_executed_basic.test
 share/mysql/test/suite/sys_vars/t/gtid_mode_basic.test
 share/mysql/test/suite/sys_vars/t/gtid_next_basic.test
-share/mysql/test/suite/sys_vars/t/gtid_next_list_basic.test
 share/mysql/test/suite/sys_vars/t/gtid_owned_basic.test
 share/mysql/test/suite/sys_vars/t/gtid_purged_basic.test
 share/mysql/test/suite/sys_vars/t/have_compress_basic.test
@@ -7648,6 +7721,7 @@ share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt
 share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_dump_at_shutdown_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_filename_basic-master.opt
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test
@@ -7705,6 +7779,7 @@ share/mysql/test/suite/sys_vars/t/innodb_limit_optimistic_insert_debug_basic.tes
 share/mysql/test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_buffer_size_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_log_compressed_pages_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_file_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_files_in_group_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test
@@ -7809,6 +7884,9 @@ share/mysql/test/suite/sys_vars/t/log_output_basic.test
 share/mysql/test/suite/sys_vars/t/log_output_func.test
 share/mysql/test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
 share/mysql/test/suite/sys_vars/t/log_slave_updates_basic.test
+share/mysql/test/suite/sys_vars/t/log_slow_admin_statements_basic.test
+share/mysql/test/suite/sys_vars/t/log_slow_admin_statements_func.test
+share/mysql/test/suite/sys_vars/t/log_slow_slave_statements_basic.test
 share/mysql/test/suite/sys_vars/t/log_throttle_queries_not_using_indexes_basic.test
 share/mysql/test/suite/sys_vars/t/log_warnings_basic_32.test
 share/mysql/test/suite/sys_vars/t/log_warnings_basic_64.test
@@ -8893,6 +8971,8 @@ share/mysql/test/t/sp_trans_log.test
 share/mysql/test/t/sp_validation.test
 share/mysql/test/t/sql_mode.test
 share/mysql/test/t/ssl-big.test
+share/mysql/test/t/ssl-sha512-master.opt
+share/mysql/test/t/ssl-sha512.test
 share/mysql/test/t/ssl.test
 share/mysql/test/t/ssl_8k_key-master.opt
 share/mysql/test/t/ssl_8k_key.test
@@ -9036,6 +9116,8 @@ share/mysql/test/t/type_temporal_upgrade.test
 share/mysql/test/t/type_time.test
 share/mysql/test/t/type_timestamp-master.opt
 share/mysql/test/t/type_timestamp.test
+share/mysql/test/t/type_timestamp_explicit-master.opt
+share/mysql/test/t/type_timestamp_explicit.test
 share/mysql/test/t/type_uint.test
 share/mysql/test/t/type_varchar.test
 share/mysql/test/t/type_year.test