[pkgsrc/pkgsrc-2019Q2]: pkgsrc/databases Pullup ticket #6029 - requested by taca

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e37e8be82d6b
branches:  pkgsrc-2019Q2
changeset: 408188:e37e8be82d6b
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Aug 10 13:12:45 2019 +0000

description:
Pullup ticket #6029 - requested by taca
databases/mysql57-client, databases/mysql57-server: security fix

Revisions pulled up:
- databases/mysql57-client/Makefile                             1.24
- databases/mysql57-client/Makefile.common                      1.20
- databases/mysql57-client/PLIST                                1.14
- databases/mysql57-client/distinfo                             1.30-1.31
- databases/mysql57-client/patches/patch-cmake_boost.cmake      1.11
- databases/mysql57-server/Makefile                             1.24
- databases/mysql57-server/PLIST                                1.13

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Mon Jul  1 04:08:55 UTC 2019

   Modified Files:
           pkgsrc/databases/mysql57-client: Makefile
           pkgsrc/databases/mysql57-server: Makefile

   Log Message:
   Recursive revbump from boost-1.70.0

---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Mon Jul  1 10:25:49 UTC 2019

   Modified Files:
           pkgsrc/databases/mysql57-client: distinfo
           pkgsrc/databases/mysql57-client/patches: patch-cmake_boost.cmake

   Log Message:
   mysql57-client: allow newer Boost; fixes building with boost-1.70.0

---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Tue Aug  6 06:56:43 UTC 2019

   Modified Files:
           pkgsrc/databases/mysql57-client: Makefile Makefile.common PLIST
               distinfo
           pkgsrc/databases/mysql57-server: Makefile PLIST

   Log Message:
   mysql57: updated to 5.7.27

   Changes in MySQL 5.7.27:

   Keyring Notes

   The keyring_aws plugin has been updated to use the latest AWS SDK and so that it works with OpenSSL 1.1.

   Packaging Notes

   Binary packages that include curl rather than linking to the system curl library now use curl 7.64.0.

   X Plugin Notes

   On Windows, X Plugin logged some messages that were unnecessary or insufficiently informative. The messages have been removed or improved as appropriate.

   Functionality Added or Changed

   Microsoft Windows: A new warning message now reminds DBAs that connections made using the MySQL named pipe on Windows has limited the permissions a connector can request on the named pipe.

   Previously, the named_pipe_full_access_group system variable was set to a value that maps to the built-in Windows Everyone group (SID S-1-1-0) by default. However, this group is not ideal and 
should be replaced with a group that restricts its membership for connectors that are unable to request fewer permissions on the MySQL named pipe.

   The new warning is written to the error log at startup if the string value assigned to named_pipe_full_access_group is '*everyone*' (or the Windows System Language equivalent) and named pipes are 
enabled. In addition, the warning is written to the error log and raised to the client if the system variable is reset to the Everyone group at runtime.

   Bugs Fixed

   InnoDB: Insufficient memory barriers in the rw-lock implementation caused deadlocks on ARM.

   Thanks to Yibo Cai from Arm Technology for the contribution.

   InnoDB: Manually changing the system time while the MySQL server was running caused page cleaner thread delays.

   InnoDB: During log application, after an OPTIMIZE TABLE operation, InnoDB did not populate virtual columns before checking for virtual column index updates.

   InnoDB: An INSERT operation involving a generated virtual BLOB column resulted a secondary index being updated with an incorrect value.

   InnoDB: A full-text cache lock taken when data is synchronized was not released if the full-text cache size exceeded the full-text cache size limit.

   InnoDB: Client sessions using different auto_increment_increment values while performing concurrent insert operations could cause a duplicate key error.

   Partitioning: ALTER TABLE ... EXCHANGE PARTITION failed with the error Non matching attribute 'ROW_FORMAT' between partition and table when the partitioned table had partitions using different row 
formats, even when the partition to be exchanged used the same row format as the non-partitioned table.

   Replication: The error message that is issued for a discrepancy between the number of group members and the auto-increment interval incorrectly referred to the 
group_replication_auto_increment_increment system variable, instead of the auto_increment_increment system variable. The value of auto_increment_increment is changed to the value specified by 
group_replication_auto_increment_increment when Group Replication starts, but only if auto_increment_increment and auto_increment_offset have their default values, and from MySQL 8.0, only in 
multi-primary mode. The value of auto_increment_increment was always the value that was checked for the error message, and it has now been corrected to give the accurate system variable name.

   Replication: When events generated by one MySQL server instance were written to the binary log of another instance, the second server implicitly assumed that the first server supported the same 
number of binary log event types as itself. Where this was not the case, the event header was handled incorrectly. The issue has now been fixed. Thanks to Facebook for the contribution.

   Replication: In Group Replication, joining members could wrongly identify themselves as incompatible with an existing replication group even if there were members at the same version already in 
the group, because they checked against all other members, including the member at the highest version. Joining members also included their own version in the compatibility check. Now, joining 
members only compare themselves with the existing group member at the lowest version, and do not count their own version.

   Replication: If a FLUSH LOGS statement was issued before the binary log file was initialized, the statement attempted to write a binary log rotation event to the uninitialized file. The server now 
checks first that a binary log file is available.

   Replication: When a MEMORY table is implicitly deleted on a master following a server restart, the master writes a DELETE statement to the binary log so that slaves also empty the table. This 
generated event now includes a comment in the binary log so that the reason for the DELETE statement is easy to identify. Thanks to Dani?l van Eeden for the contribution.

   Replication: With statement-based replication in use, if super_read_only was set to ON for a server at the point when a no-op transaction was between its UPDATE and COMMIT operations, the 
transaction was written to the binary log and assigned a GTID. The transaction is now blocked in this situation. From MySQL 8.0, the value of super_read_only cannot be changed while a transaction is 
in progress.

   Replication: The group communication engine for Group Replication (XCom, a Paxos variant) did not handle out of memory errors in an appropriate way. If memory could not be allocated to make a copy 
of the payload for a message, an error was logged but the message was still sent, with a null payload. The Group Communication System (GCS) on the receiving member discarded the message as empty, and 
the XCom instance on the receiving member accepted this action and did not retry, resulting in the message effectively being skipped. This caused the GTID set on the receiving member to diverge from 
the group, leading to replication errors. XCom now terminates gracefully if it experiences an out of memory error, so that this situation cannot occur.

   Replication: In query log events in the binary log, the thread ID used for the execution of DROP TABLE and DELETE statements was identified incorrectly or not at all. On a multi-threaded 
replication slave, where temporary tables were involved (which require the correct thread ID as they are session specific), this omission resulted in errors when using mysqlbinlog to replay the 
binary log for point-in-time recovery. The thread ID is now set correctly.

   Replication: When a slave server logs master status and connection information to a table (master_info_repository=TABLE), which is the default in MySQL 8.0, the mysql.slave_master_info table was 
not being updated on shutdown if the server was in super read only mode (super_read_only=ON). No error was written to the error log at this time, but replication failed after server startup because 
the master log file and master log position information was out of date. The thread that updates the master info log at shutdown is now excluded from read-only checks like other replication threads 
are, so it can update the table even if the server is in super read only mode. Error handling for a slave that is shutting down has also been improved so that any failure to write to the slave status 
logs results in an error in the error log.

   An overly strict assertion could be raised during sorting of stored program local objects.

   Installing from RPM packages could result in an error log with incorrect permissions.

   Enabling audit log encryption could cause a server exit.

   On Debian and Ubuntu, MySQL packages did not enable mysql.service after upgrades from native MySQL packages.

   The server did not properly close shared-memory connections when an error occurred, which could result in unexpected server behavior.

   MySQL Installer did not install OpenSSL DLL dependencies if the Development component was not selected.

   The parser could leak memory for certain multiple-statement queries.

   CREATE USER and ALTER USER did not check the validity of a hashed authentication string when used with IDENTIFIED WITH auth_plugin AS 'hash_string' syntax.

   For InnoDB tables that contained an index on a VARCHAR column and were created prior to MySQL 5.7.23, some simple ALTER TABLE statements that should have been done in place were performed with a 
table rebuild after an upgrade to MySQL 5.7.23 or higher.

   HANDLER statements did not always work correctly with tables having generated columns.

   Session-tracking information in the client/server protocol could be mishandled.

   With the PAD_CHAR_TO_FULL_LENGTH SQL mode enabled, password changes failed, with no warning or error reported.

   The audit_log plugin did not log UNINSTALL PLUGIN audit_log statements.

   audit_log filtering operations could leak memory.

   An index defined on a virtual generated column could fail to be updated if the column had a base column in a foreign key relationship.

   Privileges for dropping some Performance Schema tables were checked incorrectly.

   A query that employed a derived table which included an ORDER BY was not always handled correctly.

   Base columns were not excluded from index-only access by a generated column.

   A thread pool group could be blocked when a thread process tick time exceeded the maximum permitted value. The tick time now uses a larger data type to permit larger values.

   MySQL does not support OpenSSL session tickets, but did not set the SSL_OP_NO_TICKET flag to inform OpenSSL of that. The flag is now set.

   The audit_null plugin did not properly check for a null event record.

   UpdateXML() did not always free memory properly in certain cases.

   Empty values in the name column of the mysql.plugin system table caused the server to exit during startup.

   With the thread_pool plugin enabled, the Performance Schema status_by_thread table contained no data.

   If an INSTALL PLUGIN statement contained invalid UTF-8 characters in the shared library name, it caused the server to hang (or to raise an assertion in debug builds).

   Inner tables of different semijoin nests were interleaved during materialization, which could lead to a different result for the same query when it used a different query plan. To keep this from 
occurring, a check is added to prevent such interleaving.

   A query involving GROUP BY on a TIMESTAMP column resulted in a duplicate entry for key (ER_DUP_ENTRY) error. This problem arose when TIMESTAMP values were inserted into a table using a given 
setting for the time zone and these values were later fetched after the time zone setting had been changed, such that at least some of the inserted TIMESTAMP values occurred during the hour that the 
time changed from standard to daylight time (DST) in the new time zone, during which time the same TIMESTAMP value can exist twice. Now, when the server would otherwise return the error DUPLICATE 
ENTRY FOR KEY 'group_key', if the grouping involves a TIMESTAMP column, it instead raises the error Grouping on temporal is non-deterministic for time zones having DST. Please consider switching to 
UTC for this query.

   In addition, it is suggested to set explicit_defaults_for_timestamp to ON as well as one or more of MODE_NO_ZERO_IN_DATE, MODE_NO_ZERO_DATE, or MODE_INVALID_DATES as part of the server SQL mode to 
help avoid this issue.

diffstat:

 databases/mysql57-client/Makefile                        |   3 +-
 databases/mysql57-client/Makefile.common                 |   4 +-
 databases/mysql57-client/PLIST                           |   4 +-
 databases/mysql57-client/distinfo                        |  12 +-
 databases/mysql57-client/patches/patch-cmake_boost.cmake |  53 +++------------
 databases/mysql57-server/Makefile                        |   3 +-
 databases/mysql57-server/PLIST                           |  13 +++-
 7 files changed, 34 insertions(+), 58 deletions(-)

diffs (229 lines):

diff -r 3cf0e8b4e3c6 -r e37e8be82d6b databases/mysql57-client/Makefile
--- a/databases/mysql57-client/Makefile Sat Aug 10 12:32:34 2019 +0000
+++ b/databases/mysql57-client/Makefile Sat Aug 10 13:12:45 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2019/05/05 12:12:14 wiedi Exp $
+# $NetBSD: Makefile,v 1.22.2.1 2019/08/10 13:12:45 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   2
 COMMENT=       MySQL 5, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]*
diff -r 3cf0e8b4e3c6 -r e37e8be82d6b databases/mysql57-client/Makefile.common
--- a/databases/mysql57-client/Makefile.common  Sat Aug 10 12:32:34 2019 +0000
+++ b/databases/mysql57-client/Makefile.common  Sat Aug 10 13:12:45 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.19 2019/05/06 15:47:39 wiedi Exp $
+# $NetBSD: Makefile.common,v 1.19.2.1 2019/08/10 13:12:45 bsiegert Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.26
+DISTNAME=      mysql-5.7.27
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
diff -r 3cf0e8b4e3c6 -r e37e8be82d6b databases/mysql57-client/PLIST
--- a/databases/mysql57-client/PLIST    Sat Aug 10 12:32:34 2019 +0000
+++ b/databases/mysql57-client/PLIST    Sat Aug 10 13:12:45 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2019/04/25 10:13:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.13.2.1 2019/08/10 13:12:45 bsiegert Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -122,7 +122,7 @@
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.13
+lib/libmysqlclient.so.20.3.14
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1
diff -r 3cf0e8b4e3c6 -r e37e8be82d6b databases/mysql57-client/distinfo
--- a/databases/mysql57-client/distinfo Sat Aug 10 12:32:34 2019 +0000
+++ b/databases/mysql57-client/distinfo Sat Aug 10 13:12:45 2019 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.29 2019/04/25 10:13:04 adam Exp $
+$NetBSD: distinfo,v 1.29.2.1 2019/08/10 13:12:45 bsiegert Exp $
 
-SHA1 (mysql-5.7.26.tar.gz) = 06afaa471c4d17f00e0717467094027eeaff8ad5
-RMD160 (mysql-5.7.26.tar.gz) = 3ab0a5b4d6883af767869fa9d55a5c8fd9013121
-SHA512 (mysql-5.7.26.tar.gz) = 7bb03cd3f56ce4ef97d9d431f633b73044a2577903b2ba0872bc49773ecd268dbd72f1e6eb0165f7b08d0052e1ab4cfd9ecc4780a7ac87fb6ac33d150c511717
-Size (mysql-5.7.26.tar.gz) = 54056899 bytes
+SHA1 (mysql-5.7.27.tar.gz) = 455e1de773ebc105c5d7888b17a84df741abdc6a
+RMD160 (mysql-5.7.27.tar.gz) = 5b3cb0ae9a0ebc2530b92be24550a360fbaa0572
+SHA512 (mysql-5.7.27.tar.gz) = 76c8cf7206af2342b30af288ac0c3397875c3bf8de6af08288096181078b9aaad539e3c67a0f4f919f184d68d4b2f2a62aa812899dfe6bea07d37cb08608a7d6
+Size (mysql-5.7.27.tar.gz) = 54398696 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
-SHA1 (patch-cmake_boost.cmake) = cab30ebdff1e773d6970f541f96fce8ed51257f8
+SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
 SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed
diff -r 3cf0e8b4e3c6 -r e37e8be82d6b databases/mysql57-client/patches/patch-cmake_boost.cmake
--- a/databases/mysql57-client/patches/patch-cmake_boost.cmake  Sat Aug 10 12:32:34 2019 +0000
+++ b/databases/mysql57-client/patches/patch-cmake_boost.cmake  Sat Aug 10 13:12:45 2019 +0000
@@ -1,49 +1,20 @@
-$NetBSD: patch-cmake_boost.cmake,v 1.10 2018/12/13 19:51:45 adam Exp $
+$NetBSD: patch-cmake_boost.cmake,v 1.10.6.1 2019/08/10 13:12:45 bsiegert Exp $
 
-Fix to use a newer version of Boost.
+Allow newer Boost.
 
---- cmake/boost.cmake.orig     2017-06-22 14:13:19.000000000 +0000
+--- cmake/boost.cmake.orig     2019-04-13 13:32:15.000000000 +0000
 +++ cmake/boost.cmake
-@@ -13,7 +13,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- 
--# We want boost 1.59.0 in order to build our boost/geometry code.
-+# We want boost 1.69.0 in order to build our boost/geometry code.
- # The boost tarball is fairly big, and takes several minutes
- # to download. So we recommend downloading/unpacking it
- # only once, in a place visible from any bzr sandbox.
-@@ -31,10 +31,10 @@
- # we assume that the correct version (see below)
- # is installed on the compile host in the standard location.
- 
--SET(BOOST_PACKAGE_NAME "boost_1_59_0")
-+SET(BOOST_PACKAGE_NAME "boost_1_69_0")
- SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz")
- SET(BOOST_DOWNLOAD_URL
--  "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}";
-+  "http://sourceforge.net/projects/boost/files/boost/1.69.0/${BOOST_TARBALL}";
-   )
- 
- SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0")
-@@ -244,7 +244,7 @@ ENDIF()
- # //  BOOST_VERSION % 100 is the patch level
- # //  BOOST_VERSION / 100 % 1000 is the minor version
- # //  BOOST_VERSION / 100000 is the major version
--# #define BOOST_VERSION 105900
-+# #define BOOST_VERSION 106900
- FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp"
-   BOOST_VERSION_NUMBER
-   REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*"
-@@ -262,9 +262,9 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
+@@ -262,12 +262,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
    COULD_NOT_FIND_BOOST()
  ENDIF()
  
 -IF(NOT BOOST_MINOR_VERSION EQUAL 59)
-+IF(NOT BOOST_MINOR_VERSION EQUAL 69)
-   MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
+-  MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
 -    "we need 59"
-+    "we need 69"
-     )
-   COULD_NOT_FIND_BOOST()
- ENDIF()
+-    )
+-  COULD_NOT_FIND_BOOST()
+-ENDIF()
++
+ 
+ MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
+ 
diff -r 3cf0e8b4e3c6 -r e37e8be82d6b databases/mysql57-server/Makefile
--- a/databases/mysql57-server/Makefile Sat Aug 10 12:32:34 2019 +0000
+++ b/databases/mysql57-server/Makefile Sat Aug 10 13:12:45 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2019/05/05 12:12:14 wiedi Exp $
+# $NetBSD: Makefile,v 1.22.2.1 2019/08/10 13:12:45 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   2
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*
diff -r 3cf0e8b4e3c6 -r e37e8be82d6b databases/mysql57-server/PLIST
--- a/databases/mysql57-server/PLIST    Sat Aug 10 12:32:34 2019 +0000
+++ b/databases/mysql57-server/PLIST    Sat Aug 10 13:12:45 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/04/25 10:13:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.12.2.1 2019/08/10 13:12:45 bsiegert Exp $
 @pkgdir lib/mysql/plugin/debug
 bin/innochecksum
 bin/lz4_decompress
@@ -462,6 +462,7 @@
 share/mysql/test/include/delete_anonymous_users.inc
 share/mysql/test/include/diff_servers.inc
 share/mysql/test/include/diff_tables.inc
+share/mysql/test/include/disconnect_connections.inc
 share/mysql/test/include/end_include_file.inc
 share/mysql/test/include/end_replace_gtid_combination.inc
 share/mysql/test/include/endspace.inc
@@ -2143,6 +2144,7 @@
 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/data_50722.zip
 share/mysql/test/std_data/des_key_file
 share/mysql/test/std_data/dtrace.d
 share/mysql/test/std_data/expired-ca-key.pem
@@ -2235,6 +2237,9 @@
 share/mysql/test/std_data/server8k-cert.pem
 share/mysql/test/std_data/server8k-key.pem
 share/mysql/test/std_data/shutdown.sql
+share/mysql/test/std_data/slave-relay-bin-win.index
+share/mysql/test/std_data/slave-relay-bin.000001
+share/mysql/test/std_data/slave-relay-bin.index
 share/mysql/test/std_data/slave-relay-bin_linux.index
 share/mysql/test/std_data/slave-relay-bin_win.index
 share/mysql/test/std_data/system_tap.stp
@@ -2500,6 +2505,7 @@
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_start_stop_slave_server_id.result
 share/mysql/test/suite/binlog/r/binlog_nogtid_mix_response_packet.result
+share/mysql/test/suite/binlog/r/binlog_noop_dml_with_readonly.result
 share/mysql/test/suite/binlog/r/binlog_old_versions.result
 share/mysql/test/suite/binlog/r/binlog_purge_binary_logs_stall.result
 share/mysql/test/suite/binlog/r/binlog_purge_binary_logs_to.result
@@ -2710,6 +2716,7 @@
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_start_stop_slave_server_id.test
 share/mysql/test/suite/binlog/t/binlog_nogtid_mix_response_packet.test
+share/mysql/test/suite/binlog/t/binlog_noop_dml_with_readonly.test
 share/mysql/test/suite/binlog/t/binlog_old_versions.test
 share/mysql/test/suite/binlog/t/binlog_purge_binary_logs_stall-master.opt
 share/mysql/test/suite/binlog/t/binlog_purge_binary_logs_stall.test
@@ -9674,6 +9681,7 @@
 share/mysql/test/suite/rpl/r/rpl_extra_col_slave_myisam.result
 share/mysql/test/suite/rpl/r/rpl_extra_row_data.result
 share/mysql/test/suite/rpl/r/rpl_failed_optimize.result
+share/mysql/test/suite/rpl/r/rpl_fde_write.result
 share/mysql/test/suite/rpl/r/rpl_filter_database.result
 share/mysql/test/suite/rpl/r/rpl_filter_dbs_dynamic.result
 share/mysql/test/suite/rpl/r/rpl_filter_rewrite_db_dynamic.result
@@ -9694,7 +9702,6 @@
 share/mysql/test/suite/rpl/r/rpl_gis_geometry.result
 share/mysql/test/suite/rpl/r/rpl_grant.result
 share/mysql/test/suite/rpl/r/rpl_grant_plugin.result
-share/mysql/test/suite/rpl/r/rpl_grant_select_columns.result
 share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result
 share/mysql/test/suite/rpl/r/rpl_group_commit_update_commit_group.result
 share/mysql/test/suite/rpl/r/rpl_group_replication_commands.result
@@ -10370,6 +10377,7 @@
 share/mysql/test/suite/rpl/t/rpl_extra_col_slave_myisam.test
 share/mysql/test/suite/rpl/t/rpl_extra_row_data.test
 share/mysql/test/suite/rpl/t/rpl_failed_optimize.test
+share/mysql/test/suite/rpl/t/rpl_fde_write.test
 share/mysql/test/suite/rpl/t/rpl_filter_database-slave.opt
 share/mysql/test/suite/rpl/t/rpl_filter_database.test
 share/mysql/test/suite/rpl/t/rpl_filter_dbs_dynamic.test
@@ -10400,7 +10408,6 @@
 share/mysql/test/suite/rpl/t/rpl_grant_plugin-master.opt
 share/mysql/test/suite/rpl/t/rpl_grant_plugin-slave.opt
 share/mysql/test/suite/rpl/t/rpl_grant_plugin.test
-share/mysql/test/suite/rpl/t/rpl_grant_select_columns.test
 share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock-master.opt
 share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock.test
 share/mysql/test/suite/rpl/t/rpl_group_commit_update_commit_group.test