mysql56: updated to 5.6.46

Changes in MySQL 5.6.46

Configuration Notes

It is now possible to compile MySQL 5.6 using OpenSSL 1.1.1, enabling compilation support for MySQL 5.6 against OpenSSL even when OpenSSL 1.0.2 reaches End of Life status at the end of 2019.

In addition, MySQL 5.6 now supports TLSv1.1 and TLSv1.2 protocols for encrypted connections. This applies to MySQL Server, MySQL clients such as mysql and mysqldump, and master/slave replication. Previously, MySQL 5.6 supported only TLSv1, so TLSv1.1/TLSv1.2 support enables use of more secure TLS protocols. It also enables connecting from MySQL 5.6 clients and replication slaves to MySQL 5.7 and higher servers that have TLSv1 disabled, which previously was not possible. It also means that MySQL 5.7 and higher clients that do not want to use TLSv1 can connect to MySQL 5.6 servers.

All MySQL 5.6 builds now use OpenSSL. MySQL no longer supports using yaSSL as the SSL library, and source distributions no longer include yaSSL.

The WITH_SSL CMake option no longer permits bundled (use yaSSL) as a valid value, and the default option value has changed from bundled to system (use the version of OpenSSL installed on the host system).


Bugs Fixed

Improper locking during storage engine initialization could cause a server exit.

A query with a WHERE clause whose predicate contained a numeric value in scientific notation was not handled correctly.

VS2019 produced compilation errors with debug compilation selected due to use of the /ZI flag. Now /Z7 is used instead.

Password masking was incomplete for SHOW PROCESSLIST and some INFORMATION_SCHEMA and Performance Schema tables.

The -DWITH_EXAMPLE_STORAGE_ENGINE=1 CMake option was ignored but should not have been. If -DWITH_EXAMPLE_STORAGE_ENGINE=0 is given, the EXAMPLE storage engine is built as a plugin.

9 files changed, 49 insertions, 57 deletions

diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index 5fcc57ab3e5..cdcaf17bea0 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2019/08/11 13:18:20 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/10/14 19:44:46 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/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index 9cd024f4d74..aca6c6c7a60 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.52 2019/08/06 06:55:15 adam Exp $
+# $NetBSD: Makefile.common,v 1.53 2019/10/14 19:44:46 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.45
+DISTNAME=	mysql-5.6.46
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index c31e4ae720c..0ba21222b79 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.53 2019/09/06 10:01:44 taca Exp $
+$NetBSD: distinfo,v 1.54 2019/10/14 19:44:46 adam Exp $
 
-SHA1 (mysql-5.6.45.tar.gz) = f42901c8d52297912da4978ec9422458cff72071
-RMD160 (mysql-5.6.45.tar.gz) = c711161babd1b8f9b7f96d88264a468972a83a0b
-SHA512 (mysql-5.6.45.tar.gz) = f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168
-Size (mysql-5.6.45.tar.gz) = 32525559 bytes
+SHA1 (mysql-5.6.46.tar.gz) = dd735b6efa8f5be61ba65b58755188f38986151c
+RMD160 (mysql-5.6.46.tar.gz) = c0486a82fc070cffb7b56609c630dfec369e0240
+SHA512 (mysql-5.6.46.tar.gz) = 5a1ef9085b1461adb6eec7e9c80d347736ddbe2cd5087b5aebcac54094af8ce3bc5dc99499dd517a469e0bc4a40df8325e4306da5a05388950f4fd6652f6b5b9
+Size (mysql-5.6.46.tar.gz) = 32395002 bytes
 SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
 RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
 SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
@@ -18,7 +18,7 @@ SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 SHA1 (patch-cmake_os_SunOS.cmake) = 60ba9f81c28bbb78295b8a12fe6cd3b176c03f91
 SHA1 (patch-cmake_plugin.cmake) = 5e7bfccd02fa66993f6615b2d57fb032ac9e8b14
 SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981
-SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
+SHA1 (patch-cmake_ssl.cmake) = b351b80c96e27e0f281bf2de8b3fc8911500f579
 SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
 SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
 SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
@@ -27,24 +27,21 @@ SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
 SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my_net.h) = 8d97e4396fd1df095798fca79cc07daffff449d3
 SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca
-SHA1 (patch-libmysql_CMakeLists.txt) = 229044de6d11b26ee99b25be99b628a9f146b795
+SHA1 (patch-libmysql_CMakeLists.txt) = 83a4a8efe4bc44722c207ca61722b9bed65cc5e0
 SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d
-SHA1 (patch-mysys__ssl_CMakeLists.txt) = e50bad459520be78ea2d5c4d0699cda8c1141884
-SHA1 (patch-mysys__ssl_my__aes__openssl.cc) = c6bcab27d992f90f7929cb697a7c7565671ebb6f
+SHA1 (patch-mysys__ssl_CMakeLists.txt) = 81d23996ef890b269b0ea33c92bd7fd6cc556d78
 SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e
 SHA1 (patch-scripts_CMakeLists.txt) = 5b44d2d137e3e64474d663a8faab5b5f289f4cf5
 SHA1 (patch-scripts_mysql__install__db.pl.in) = c2ed1705a530a0f2dfb8325496ceb7e2a9c98185
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
 SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5
 SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e
-SHA1 (patch-sql_mysqld.cc) = 953ea6b1178e5d139446bc45a96730a9de9051e3
-SHA1 (patch-sql_rpl__slave.cc) = cc231060d7b8c1efe230c324fb7dfee90b058589
 SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf
 SHA1 (patch-sql_sys__vars.cc) = 355b17dac8da6f94c9996ae406df304113a1f8f5
 SHA1 (patch-storage_archive_CMakeLists.txt) = e739ef4884a154d7e33e8aae24234fd6855119b7
 SHA1 (patch-storage_blackhole_CMakeLists.txt) = b9c526783cabd04ea7859d62cb1930ff35f905f8
 SHA1 (patch-storage_csv_CMakeLists.txt) = 739accd1fb85b051e28f5c3f16a6c3c0f77d6dae
-SHA1 (patch-storage_example_CMakeLists.txt) = a80b1dd3c6020b3fe958db35bebe3bd181136f0d
+SHA1 (patch-storage_example_CMakeLists.txt) = c48c46b8130f00fcb5098e6b2280bff8f16b5559
 SHA1 (patch-storage_federated_CMakeLists.txt) = f809504bad63129a06ce455b49ee40cca940891e
 SHA1 (patch-storage_heap_CMakeLists.txt) = 0a1a5a7b5e83f14cec43bfa4782dd4bb7b629347
 SHA1 (patch-storage_innobase_include_univ.i) = eb305029b8529cab88c80d75821fc9940e0f6b0b
@@ -52,5 +49,3 @@ SHA1 (patch-storage_myisam_CMakeLists.txt) = 55897ae78208f78a396776d1082cb5f9863
 SHA1 (patch-storage_myisammrg_CMakeLists.txt) = 0a56a16ccaff3fa9de996fec6ffc324af9855a4e
 SHA1 (patch-storage_ndb_include_util_Parser.hpp) = 037fc153619bf79ee95cb03a5ac4a71c14952c3a
 SHA1 (patch-strings_decimal.c) = 069c9d930c735f74510702baa9bef38aec425903
-SHA1 (patch-vio_vio.c) = 33914d1a3c8d9c7b4b83ba0b9be97c007137a7cd
-SHA1 (patch-vio_viosslfactories.c) = 0ec8e17abb5419f49a9fc803c374da70306b5e3a
diff --git a/databases/mysql56-client/patches/patch-cmake_ssl.cmake b/databases/mysql56-client/patches/patch-cmake_ssl.cmake
index 0cc005ee707..fb3bf0acbcd 100644
--- a/databases/mysql56-client/patches/patch-cmake_ssl.cmake
+++ b/databases/mysql56-client/patches/patch-cmake_ssl.cmake
@@ -1,11 +1,11 @@
-$NetBSD: patch-cmake_ssl.cmake,v 1.2 2013/04/20 08:06:01 adam Exp $
+$NetBSD: patch-cmake_ssl.cmake,v 1.3 2019/10/14 19:44:47 adam Exp $
 
 Allow OpenSSH versions below 1.0.
 Do not prefer static libraries (or linking will fail).
 
---- cmake/ssl.cmake.orig	2013-04-05 12:27:18.000000000 +0000
+--- cmake/ssl.cmake.orig	2019-09-27 07:04:56.000000000 +0000
 +++ cmake/ssl.cmake
-@@ -143,9 +143,7 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -152,9 +152,7 @@ MACRO (MYSQL_CHECK_SSL)
      ENDIF()
  
      # On mac this list is <.dylib;.so;.a>
@@ -14,9 +14,9 @@ Do not prefer static libraries (or linking will fail).
 -      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)
  
+@@ -194,8 +192,7 @@ MACRO (MYSQL_CHECK_SSL)
+     ENDIF()
      IF(OPENSSL_INCLUDE_DIR AND
         OPENSSL_LIBRARY   AND
 -       CRYPTO_LIBRARY      AND
diff --git a/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt b/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt
index 42ab73618a5..4dba43f649f 100644
--- a/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-libmysql_CMakeLists.txt,v 1.3 2013/12/03 20:02:42 adam Exp $
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.4 2019/10/14 19:44:47 adam Exp $
 
-* Generate libmysqlclient.so.18.0.0 file and libmysqlclient_r.so.18.0.0 symlink
-  on FreeBSD to supress PLIST divergence.
+Generate libmysqlclient.so.18.1.0 file and libmysqlclient_r.so.18.1.0 symlink
+on FreeBSD to supress PLIST divergence.
 
---- libmysql/CMakeLists.txt.orig	2013-07-10 16:17:29.000000000 +0000
+--- libmysql/CMakeLists.txt.orig	2019-09-27 07:04:56.000000000 +0000
 +++ libmysql/CMakeLists.txt
-@@ -224,7 +224,7 @@ IF(NOT DISABLE_SHARED)
-     COMPONENT SharedLibraries)
+@@ -250,7 +250,7 @@ IF(NOT DISABLE_SHARED)
+   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
    IF(UNIX)
      # libtool compatability
 -    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
diff --git a/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt b/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt
index 3ce45bb6ef9..bc9ec51bfd1 100644
--- a/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt
@@ -1,13 +1,13 @@
-$NetBSD: patch-mysys__ssl_CMakeLists.txt,v 1.2 2014/08/10 15:11:57 adam Exp $
+$NetBSD: patch-mysys__ssl_CMakeLists.txt,v 1.3 2019/10/14 19:44:47 adam Exp $
 
 Build with newer DTrace.
 
---- mysys_ssl/CMakeLists.txt.orig	2014-07-18 15:48:39.000000000 +0000
+--- mysys_ssl/CMakeLists.txt.orig	2019-09-27 07:04:56.000000000 +0000
 +++ mysys_ssl/CMakeLists.txt
-@@ -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})
+@@ -48,7 +48,6 @@ TARGET_LINK_LIBRARIES(mysys_ssl ${CMAKE_
+ IF(WIN32)
+   TARGET_LINK_LIBRARIES(mysys_ssl crypt32)
+ ENDIF()
 -DTRACE_INSTRUMENT(mysys_ssl)
  
  IF(MSVC)
diff --git a/databases/mysql56-client/patches/patch-storage_example_CMakeLists.txt b/databases/mysql56-client/patches/patch-storage_example_CMakeLists.txt
index 387ba1d227a..57662e714dd 100644
--- a/databases/mysql56-client/patches/patch-storage_example_CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-storage_example_CMakeLists.txt
@@ -1,13 +1,14 @@
-$NetBSD: patch-storage_example_CMakeLists.txt,v 1.1 2014/02/13 14:38:08 jperkin Exp $
+$NetBSD: patch-storage_example_CMakeLists.txt,v 1.2 2019/10/14 19:44:47 adam Exp $
 
 Build with newer DTrace.
 
---- storage/example/CMakeLists.txt.orig	2013-11-17 18:02:53.000000000 +0000
+--- storage/example/CMakeLists.txt.orig	2019-10-14 18:53:07.000000000 +0000
 +++ storage/example/CMakeLists.txt
-@@ -15,4 +15,5 @@
- 
- SET(EXAMPLE_PLUGIN_DYNAMIC "ha_example")
- SET(EXAMPLE_SOURCES ha_example.cc)
--MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY)
-+MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY
-+                 DTRACE_INSTRUMENTED)
+@@ -25,5 +25,6 @@ SET(EXAMPLE_SOURCES ha_example.cc)
+ IF(WITH_EXAMPLE_STORAGE_ENGINE AND NOT WITHOUT_EXAMPLE_STORAGE_ENGINE)
+   MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE DEFAULT)
+ ELSEIF(NOT WITHOUT_EXAMPLE_STORAGE_ENGINE)
+-  MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY)
++  MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY
++                   DTRACE_INSTRUMENTED)
+ ENDIF()
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 09c0ba80763..3933ccef1cc 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2019/09/18 15:43:18 taca Exp $
+# $NetBSD: Makefile,v 1.41 2019/10/14 19:44:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index 07afbcc7d15..b8af57e16f2 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2019/04/25 08:53:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2019/10/14 19:44:47 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -22,6 +22,7 @@ ${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/connection_control.so
 lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/ha_example.so
 ${PLIST.sphinx}lib/mysql/plugin/ha_sphinx.so
 ${PLIST.memcached}lib/mysql/plugin/innodb_engine.so
 lib/mysql/plugin/libdaemon_example.so
@@ -38,10 +39,10 @@ lib/mysql/plugin/udf_example.so
 lib/mysql/plugin/validate_password.so
 sbin/mysqld
 share/aclocal/mysql.m4
-share/doc/mysql/COPYING
 share/doc/mysql/ChangeLog
 share/doc/mysql/INFO_BIN
 share/doc/mysql/INFO_SRC
+share/doc/mysql/LICENSE
 share/doc/mysql/README
 share/mysql/binary-configure
 share/mysql/bulgarian/errmsg.sys
@@ -341,6 +342,7 @@ share/mysql/test/extra/rpl_tests/rpl_truncate_helper.test
 share/mysql/test/extra/rpl_tests/type_conversions.test
 share/mysql/test/include/Load_data.inc
 share/mysql/test/include/add_anonymous_users.inc
+share/mysql/test/include/allowed_ciphers.inc
 share/mysql/test/include/analyze-sync_with_master.test
 share/mysql/test/include/analyze-timeout.test
 share/mysql/test/include/assert.inc
@@ -623,7 +625,6 @@ share/mysql/test/include/not_ndb_default.inc
 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
@@ -1795,7 +1796,7 @@ share/mysql/test/std_data/crl-client-revoked-key.pem
 share/mysql/test/std_data/crl-client-revoked.crl
 share/mysql/test/std_data/crl-server-cert.pem
 share/mysql/test/std_data/crl-server-key.pem
-share/mysql/test/std_data/crldir/ab8a3803.r0
+share/mysql/test/std_data/crldir/b23bb52f.r0
 share/mysql/test/std_data/des_key_file
 share/mysql/test/std_data/dtrace.d
 share/mysql/test/std_data/funcs_1/innodb_tb1.txt
@@ -1899,7 +1900,6 @@ 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/cert_verify.result
@@ -1921,8 +1921,6 @@ share/mysql/test/suite/auth_sec/r/secure_file_priv_null.result
 share/mysql/test/suite/auth_sec/r/secure_file_priv_warnings.result
 share/mysql/test/suite/auth_sec/r/secure_file_priv_warnings_not_win.result
 share/mysql/test/suite/auth_sec/r/secure_file_priv_warnings_win.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
@@ -1947,8 +1945,6 @@ share/mysql/test/suite/auth_sec/t/secure_file_priv_null.test
 share/mysql/test/suite/auth_sec/t/secure_file_priv_warnings.test
 share/mysql/test/suite/auth_sec/t/secure_file_priv_warnings_not_win.test
 share/mysql/test/suite/auth_sec/t/secure_file_priv_warnings_win.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
@@ -4956,8 +4952,6 @@ share/mysql/test/suite/ndb_rpl/t/ndb_rpl_apply_status.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_bank.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_basic.test
-share/mysql/test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-master.opt
-share/mysql/test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors-slave.opt
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_binlog_format_errors.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_bitfield.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_blob.test
@@ -6386,6 +6380,7 @@ share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result
 share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result
 share/mysql/test/suite/rpl/r/rpl_binlog_errors.result
 share/mysql/test/suite/rpl/r/rpl_binlog_failed_drop_table.result
+share/mysql/test/suite/rpl/r/rpl_binlog_format_errors.result
 share/mysql/test/suite/rpl/r/rpl_binlog_gcommit_options.result
 share/mysql/test/suite/rpl/r/rpl_binlog_grant.result
 share/mysql/test/suite/rpl/r/rpl_binlog_index.result
@@ -6876,6 +6871,9 @@ share/mysql/test/suite/rpl/t/rpl_binlog_errors-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_errors.test
 share/mysql/test/suite/rpl/t/rpl_binlog_failed_drop_table-slave.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_failed_drop_table.test
+share/mysql/test/suite/rpl/t/rpl_binlog_format_errors-master.opt
+share/mysql/test/suite/rpl/t/rpl_binlog_format_errors-slave.opt
+share/mysql/test/suite/rpl/t/rpl_binlog_format_errors.test
 share/mysql/test/suite/rpl/t/rpl_binlog_gcommit_options-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_gcommit_options.test
 share/mysql/test/suite/rpl/t/rpl_binlog_grant.test