CVS commit: pkgsrc/databases

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jul 25 20:29:14 UTC 2021

Modified Files:
        pkgsrc/databases/mysql57-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mysql57-client/patches: patch-sql_CMakeLists.txt
        pkgsrc/databases/mysql57-server: Makefile PLIST

Log Message:
mysql57: updated to 5.7.35

Changes in MySQL 5.7.35 (2021-07-20, General Availability)

Audit Log Notes

Deprecation and Removal Notes

Packaging Notes

Bugs Fixed

Audit Log Notes

For MySQL Enterprise Audit, the new audit_log_format_unix_timestamp system variable enables inclusion of a time field in each audit record. The field value is an integer that represents the UNIX 
timestamp value indicating the date and time when the audit event was generated. The time field is supported only for JSON-format log files.

Deprecation and Removal Notes

The TLSv1 and TLSv1.1 connection protocols now are deprecated and support for them is subject to removal in a future MySQL version. (For background, refer to the IETF memo Deprecating TLSv1.0 and 
TLSv1.1.) It is recommended that connections be made using the more-secure TLSv1.2 and TLSv1.3 protocols. TLSv1.3 requires that both the MySQL server and the client application be compiled with 
OpenSSL 1.1.1 or higher.

On the server side, this deprecation has the following effects:

If the tls_version system variable is assigned a value containing a deprecated TLS protocol during server startup, the server writes a warning for each deprecated protocol to the error log.

If a client successfully connects using a deprecated TLS protocol, the server writes a warning to the error log.

On the client side, the deprecation has no visible effect. Clients do not issue a warning if configured to permit a deprecated TLS protocol. This includes:

Client programs that support a --tls-version option for specifying TLS protocols for connections to the MySQL server.

Statements that enable replicas to specify TLS protocols for connections to the source server. (CHANGE MASTER TO has a MASTER_TLS_VERSION option.)

Packaging Notes

Binary packages that include curl rather than linking to the system curl library have been upgraded to use curl 7.77.0.

The bundled lz4 library was upgraded to version 1.9.3.

Bugs Fixed

InnoDB: A deadlock between a user thread and purge thread involving a undo log page and rollback segment page occurred after an undo tablespace truncate operation was initiated. The deadlock caused a 
long semaphore wait and an eventual failure.

InnoDB: An integer underflow issue was addressed in the InnoDB mecached plugin sources.

InnoDB: An index with a key prefix length greater than 767 bytes was permitted on a table defined with the REDUNDANT row format, exceeding the index key prefix length limit for that row format. The 
ALTER TABLE operation that added the index validated the index key prefix length for the row format defined by the innodb_default_row_format variable instead of the actual row format of the table. 
The fix ensures that index key prefix length is validated for the correct row format.

InnoDB: An online buffer pool resizing operation freed the previous buffer pool page hash, conflicting with a concurrent buffer pool lookup that required the previous page hash.

InnoDB: Numerous system temporary table pages at the tail of the buffer pool flush list caused a performance degradation. The flush_list_mutex was held while the flush list scan traversed over system 
temporary table pages. The flush list scan now excludes system temporary table pages.

InnoDB: A binary log rotation deadlock occurred on a system using statement-based replication where there was high number of concurrent update operations and low innodb_thread_concurrency setting.

Replication: When the system variable replication_optimize_for_static_plugin_config was set, the plugins for Group Replication and semi-synchronous replication could not be uninstalled cleanly on 
server shutdown.

Replication: A deadlock could occur when START GROUP_REPLICATION and STOP GROUP_REPLICATION statements were issued at the same time that a view change was taking place for the group.

Replication: A deadlock could occur if a STOP GROUP_REPLICATION statement was issued when a replication channel on a group member was attempting to commit a transaction. The server now rolls back the 
transaction immediately if it cannot acquire the relevant lock, rather than waiting for the lock and the commit to complete and causing the deadlock.

Replication: On a multithreaded replica, the reference to the active event was sometimes managed incorrectly when retrying a transaction.

Replication: Replica servers now check and validate the transaction ID part of a GTID before applying and committing the transaction associated with it.

Replication: Replication could stop on a multithreaded replica if a unique secondary key was omitted from the writeset hashes used to compute transaction dependencies, leading to errors when 
executing the transactions on the multithreaded replica. Write set hashes now always include unique secondary keys even if they are not included in the read set and write set.

JSON: Passing NULL to a stored procedure expecting a JSON parameter led to an assertion failure in debug builds.

Replication could fail if a DML statement was executed immediately after an XA transaction was rejected or forced to rollback due to a deadlock.

The mysql_change_user() C API function did not properly parse the COM_CHANGE_USER packet, which could result in silent failure to process optional query attributes that may have been supplied prior 
to the mysql_change_user() call. Thanks for René Cannaò for the contribution.

Repreparation of a prepared statement at the beginning of an implicit transaction could cause an ER_GTID_NEXT_TYPE_UNDEFINED_GROUP error.

An out-of-memory error occurred when loading large amounts of data into tables with full-text search indexes. Not all of the memory allocated to the full-text search cache was accounted for when 
inserting data into the full-text search auxiliary tables.

A secondary index over a virtual column became corrupted when the index was built online.

For UPDATE statements, we fix this as follows: If the virtual column value of the index record is set to NULL, then we generate this value from the cluster index record.

Boolean system variables could be assigned a negative value.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/databases/mysql57-client/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/mysql57-client/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mysql57-client/patches/patch-sql_CMakeLists.txt
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/mysql57-server/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/mysql57-server/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql57-client/Makefile
diff -u pkgsrc/databases/mysql57-client/Makefile:1.37 pkgsrc/databases/mysql57-client/Makefile:1.38
--- pkgsrc/databases/mysql57-client/Makefile:1.37       Mon May 24 19:49:30 2021
+++ pkgsrc/databases/mysql57-client/Makefile    Sun Jul 25 20:29:14 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2021/05/24 19:49:30 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2021/07/25 20:29:14 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]*

Index: pkgsrc/databases/mysql57-client/Makefile.common
diff -u pkgsrc/databases/mysql57-client/Makefile.common:1.34 pkgsrc/databases/mysql57-client/Makefile.common:1.35
--- pkgsrc/databases/mysql57-client/Makefile.common:1.34        Thu Apr 29 16:50:32 2021
+++ pkgsrc/databases/mysql57-client/Makefile.common     Sun Jul 25 20:29:14 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.34 2021/04/29 16:50:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.35 2021/07/25 20:29:14 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.34
+DISTNAME=      mysql-5.7.35
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
@@ -77,7 +77,6 @@ CMAKE_ARGS+=  -DWITH_EXTRA_CHARSETS=${MYS
 
 CPPFLAGS+=             -Dunix
 CFLAGS+=               -DUSE_OLD_FUNCTIONS # 3.23.x compat
-#CFLAGS+=              -D__STDC_FORMAT_MACROS=1 # always defined too late
 
 .if ${OPSYS} != "Interix"
 CFLAGS+=               -fPIC -DPIC
@@ -119,6 +118,12 @@ USE_BUILTIN.editline=      no
 
 CHECK_PORTABILITY_SKIP+=       packaging/deb-in/mysql-packagesource-server.config.in
 
+# Remove internal boost. Even though external boost is detected, the build might fail.
+post-extract: remove-boost
+.PHONY: remove-boost
+remove-boost:
+       ${RM} -f -r ${WRKSRC}/include/boost_1_59_0
+
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/editline/buildlink3.mk"

Index: pkgsrc/databases/mysql57-client/PLIST
diff -u pkgsrc/databases/mysql57-client/PLIST:1.21 pkgsrc/databases/mysql57-client/PLIST:1.22
--- pkgsrc/databases/mysql57-client/PLIST:1.21  Wed Apr 21 13:26:54 2021
+++ pkgsrc/databases/mysql57-client/PLIST       Sun Jul 25 20:29:14 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2021/04/21 13:26:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2021/07/25 20:29:14 adam Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -122,7 +122,7 @@ include/mysql/typelib.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.21
+lib/libmysqlclient.so.20.3.22
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.42 pkgsrc/databases/mysql57-client/distinfo:1.43
--- pkgsrc/databases/mysql57-client/distinfo:1.42       Thu Apr 29 16:50:32 2021
+++ pkgsrc/databases/mysql57-client/distinfo    Sun Jul 25 20:29:14 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2021/04/29 16:50:32 adam Exp $
+$NetBSD: distinfo,v 1.43 2021/07/25 20:29:14 adam Exp $
 
-SHA1 (mysql-5.7.34.tar.gz) = d1842baea3abc4b4cd684186e88b123d854d4ed7
-RMD160 (mysql-5.7.34.tar.gz) = f23902a074cb7bcd05dc7ef8c04186021c4d689c
-SHA512 (mysql-5.7.34.tar.gz) = a59b27e56963a8b57f8e3d89890d7ea0e4e157f81f274670ab0416d5fccb0da1b09b7702b58c3c9de726ee03bd1b84a6d2bf309e1e3e3fba285361e5bc3d059c
-Size (mysql-5.7.34.tar.gz) = 56150251 bytes
+SHA1 (mysql-5.7.35.tar.gz) = 73e64bfa96c8982e54f6c44348f233419d582e8f
+RMD160 (mysql-5.7.35.tar.gz) = 3193e5c3d9ec916229d0050acf37af2a4d4c8d5e
+SHA512 (mysql-5.7.35.tar.gz) = ec22599b67d5826fcc04c146f06fdd18080003a95b366bef133af0ea772b0b0fc2f613f17699cd3c8d461acb71b7e94af856a4574e644ec25b70db29abac509d
+Size (mysql-5.7.35.tar.gz) = 56228901 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
@@ -36,7 +36,7 @@ SHA1 (patch-rapid_plugin_group__replicat
 SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 65853fea39a88811cdd8af28ef3c659a0ccbc0e1
 SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
-SHA1 (patch-sql_CMakeLists.txt) = 697add15adb66bf55cf561a6e43e0bf514d1e068
+SHA1 (patch-sql_CMakeLists.txt) = 9bfb708542dadd8885f27f1345a6e66a37bf9142
 SHA1 (patch-sql_conn__handler_socket__connection.cc) = 12cf83e061edbe59eb073037b1036903b7ba4b00
 SHA1 (patch-sql_item__geofunc__internal.cc) = 752862c3a30231e694e508ced1a215a610649fc6
 SHA1 (patch-sql_locks_shared__spin__lock.cc) = 32777eb07d42a3c5c7cfc331eea4d8218cabe486

Index: pkgsrc/databases/mysql57-client/patches/patch-sql_CMakeLists.txt
diff -u pkgsrc/databases/mysql57-client/patches/patch-sql_CMakeLists.txt:1.2 pkgsrc/databases/mysql57-client/patches/patch-sql_CMakeLists.txt:1.3
--- pkgsrc/databases/mysql57-client/patches/patch-sql_CMakeLists.txt:1.2        Thu Nov 22 16:14:53 2018
+++ pkgsrc/databases/mysql57-client/patches/patch-sql_CMakeLists.txt    Sun Jul 25 20:29:14 2021
@@ -1,13 +1,13 @@
-$NetBSD: patch-sql_CMakeLists.txt,v 1.2 2018/11/22 16:14:53 adam Exp $
+$NetBSD: patch-sql_CMakeLists.txt,v 1.3 2021/07/25 20:29:14 adam Exp $
 
---- sql/CMakeLists.txt.orig    2018-10-04 05:48:22.000000000 +0000
+--- sql/CMakeLists.txt.orig    2021-06-07 12:52:05.000000000 +0000
 +++ sql/CMakeLists.txt
-@@ -23,6 +23,8 @@ INCLUDE_DIRECTORIES(
+@@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES(
    ${CMAKE_SOURCE_DIR}/regex 
    ${SSL_INCLUDE_DIRS}
    ${CMAKE_BINARY_DIR}/sql
 +  ${CMAKE_BINARY_DIR}/include
 +  ${CMAKE_BINARY_DIR}
-   ${LZ4_INCLUDE_DIR}
  )
  
+ SET(CONF_SOURCES

Index: pkgsrc/databases/mysql57-server/Makefile
diff -u pkgsrc/databases/mysql57-server/Makefile:1.38 pkgsrc/databases/mysql57-server/Makefile:1.39
--- pkgsrc/databases/mysql57-server/Makefile:1.38       Mon May 24 19:49:30 2021
+++ pkgsrc/databases/mysql57-server/Makefile    Sun Jul 25 20:29:14 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2021/05/24 19:49:30 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2021/07/25 20:29:14 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*

Index: pkgsrc/databases/mysql57-server/PLIST
diff -u pkgsrc/databases/mysql57-server/PLIST:1.21 pkgsrc/databases/mysql57-server/PLIST:1.22
--- pkgsrc/databases/mysql57-server/PLIST:1.21  Wed Apr 21 13:26:54 2021
+++ pkgsrc/databases/mysql57-server/PLIST       Sun Jul 25 20:29:14 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2021/04/21 13:26:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2021/07/25 20:29:14 adam Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -773,6 +773,7 @@ share/mysql/test/include/only_binlog_tra
 share/mysql/test/include/only_mts_slave_parallel_type_database.inc
 share/mysql/test/include/only_mts_slave_parallel_type_logical_clock.inc
 share/mysql/test/include/only_mts_slave_parallel_workers.inc
+share/mysql/test/include/only_with_option.inc
 share/mysql/test/include/openssl_cert_generation_debug_test.inc
 share/mysql/test/include/order_by.inc
 share/mysql/test/include/parser-big.inc
@@ -1894,6 +1895,7 @@ share/mysql/test/r/ssl_crl_clients-valid
 share/mysql/test/r/ssl_crl_clients.result
 share/mysql/test/r/ssl_crl_clients_valid.result
 share/mysql/test/r/ssl_crl_crlpath.result
+share/mysql/test/r/ssl_deprecated_tls_versions.result
 share/mysql/test/r/ssl_verify_identity.result
 share/mysql/test/r/status.result
 share/mysql/test/r/status2.result
@@ -2061,6 +2063,7 @@ share/mysql/test/r/wl6661.result
 share/mysql/test/r/wl6711_heap_to_disk.result
 share/mysql/test/r/wl6978.result
 share/mysql/test/r/xa.result
+share/mysql/test/r/xa_deadlock_binlog.result
 share/mysql/test/r/xa_debug.result
 share/mysql/test/r/xa_gtid.result
 share/mysql/test/r/xa_prepared_binlog_off.result
@@ -2484,6 +2487,7 @@ share/mysql/test/suite/binlog/r/binlog_g
 share/mysql/test/suite/binlog/r/binlog_gtid_next_single_stmt_trx_rollback.result
 share/mysql/test/suite/binlog/r/binlog_gtid_next_temporary_table.result
 share/mysql/test/suite/binlog/r/binlog_gtid_next_xa.result
+share/mysql/test/suite/binlog/r/binlog_gtid_ps_reprepare.result
 share/mysql/test/suite/binlog/r/binlog_gtid_purge_binlog_at_startup.result
 share/mysql/test/suite/binlog/r/binlog_gtid_rbr_only_flag.result
 share/mysql/test/suite/binlog/r/binlog_gtid_reset_consistency_violation_on_fail.result
@@ -2535,6 +2539,7 @@ share/mysql/test/suite/binlog/r/binlog_r
 share/mysql/test/suite/binlog/r/binlog_rewrite_order.result
 share/mysql/test/suite/binlog/r/binlog_rewrite_suppress_use.result
 share/mysql/test/suite/binlog/r/binlog_rotate_bgc_sync.result
+share/mysql/test/suite/binlog/r/binlog_rotate_deadlock.result
 share/mysql/test/suite/binlog/r/binlog_row_binlog.result
 share/mysql/test/suite/binlog/r/binlog_row_cache_stat.result
 share/mysql/test/suite/binlog/r/binlog_row_create_select_crash.result
@@ -2687,6 +2692,7 @@ share/mysql/test/suite/binlog/t/binlog_g
 share/mysql/test/suite/binlog/t/binlog_gtid_next_single_stmt_trx_rollback.test
 share/mysql/test/suite/binlog/t/binlog_gtid_next_temporary_table.test
 share/mysql/test/suite/binlog/t/binlog_gtid_next_xa.test
+share/mysql/test/suite/binlog/t/binlog_gtid_ps_reprepare.test
 share/mysql/test/suite/binlog/t/binlog_gtid_purge_binlog_at_startup.test
 share/mysql/test/suite/binlog/t/binlog_gtid_rbr_only_flag.test
 share/mysql/test/suite/binlog/t/binlog_gtid_reset_consistency_violation_on_fail.test
@@ -2746,6 +2752,8 @@ share/mysql/test/suite/binlog/t/binlog_r
 share/mysql/test/suite/binlog/t/binlog_rewrite_order.test
 share/mysql/test/suite/binlog/t/binlog_rewrite_suppress_use.test
 share/mysql/test/suite/binlog/t/binlog_rotate_bgc_sync.test
+share/mysql/test/suite/binlog/t/binlog_rotate_deadlock-master.opt
+share/mysql/test/suite/binlog/t/binlog_rotate_deadlock.test
 share/mysql/test/suite/binlog/t/binlog_row_binlog-master.opt
 share/mysql/test/suite/binlog/t/binlog_row_binlog.test
 share/mysql/test/suite/binlog/t/binlog_row_cache_stat.test
@@ -4545,6 +4553,7 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/r/gr_stop_when_unreachable.result
 share/mysql/test/suite/group_replication/r/gr_stop_with_gtid_gaps.result
 share/mysql/test/suite/group_replication/r/gr_stop_with_gtid_gaps_applier.result
+share/mysql/test/suite/group_replication/r/gr_stop_with_running_channel.result
 share/mysql/test/suite/group_replication/r/gr_storage_engines.result
 share/mysql/test/suite/group_replication/r/gr_super_read_only_version_module.result
 share/mysql/test/suite/group_replication/r/gr_table_without_primary_key.result
@@ -5055,6 +5064,7 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/t/gr_stop_when_unreachable.test
 share/mysql/test/suite/group_replication/t/gr_stop_with_gtid_gaps.test
 share/mysql/test/suite/group_replication/t/gr_stop_with_gtid_gaps_applier.test
+share/mysql/test/suite/group_replication/t/gr_stop_with_running_channel.test
 share/mysql/test/suite/group_replication/t/gr_storage_engines.test
 share/mysql/test/suite/group_replication/t/gr_super_read_only_version_module.cnf
 share/mysql/test/suite/group_replication/t/gr_super_read_only_version_module.test
@@ -5137,6 +5147,7 @@ share/mysql/test/suite/innodb/r/alter_mi
 share/mysql/test/suite/innodb/r/alter_page_size.result
 share/mysql/test/suite/innodb/r/alter_rename_existing.result
 share/mysql/test/suite/innodb/r/alter_rename_files.result
+share/mysql/test/suite/innodb/r/alter_row_format.result
 share/mysql/test/suite/innodb/r/alter_table_redundant.result
 share/mysql/test/suite/innodb/r/alter_table_stage_progress.result
 share/mysql/test/suite/innodb/r/analyze_index.result
@@ -5505,6 +5516,7 @@ share/mysql/test/suite/innodb/t/alter_mi
 share/mysql/test/suite/innodb/t/alter_page_size.test
 share/mysql/test/suite/innodb/t/alter_rename_existing.test
 share/mysql/test/suite/innodb/t/alter_rename_files.test
+share/mysql/test/suite/innodb/t/alter_row_format.test
 share/mysql/test/suite/innodb/t/alter_table_redundant.test
 share/mysql/test/suite/innodb/t/alter_table_stage_progress-master.opt
 share/mysql/test/suite/innodb/t/alter_table_stage_progress.test
@@ -9874,6 +9886,7 @@ share/mysql/test/suite/rpl/r/rpl_mixed_d
 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_row_innodb.result
+share/mysql/test/suite/rpl/r/rpl_mta_rows_query_event_double_free.result
 share/mysql/test/suite/rpl/r/rpl_mts_database_transaction_retry.result
 share/mysql/test/suite/rpl/r/rpl_mts_debug.result
 share/mysql/test/suite/rpl/r/rpl_mts_delete_file_event.result
@@ -10153,6 +10166,7 @@ share/mysql/test/suite/rpl/r/rpl_show_sl
 share/mysql/test/suite/rpl/r/rpl_show_slave_status_deadlock.result
 share/mysql/test/suite/rpl/r/rpl_show_slave_status_nonblocking.result
 share/mysql/test/suite/rpl/r/rpl_show_slave_status_nonblocking_debug.result
+share/mysql/test/suite/rpl/r/rpl_shutdown_with_optimize_for_static_plugin_config.result
 share/mysql/test/suite/rpl/r/rpl_simulate_create_chunk_failure.result
 share/mysql/test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
 share/mysql/test/suite/rpl/r/rpl_skip_error.result
@@ -10265,6 +10279,7 @@ share/mysql/test/suite/rpl/r/rpl_wait_fo
 share/mysql/test/suite/rpl/r/rpl_wait_for_executed_gtid_set_no_timeout.result
 share/mysql/test/suite/rpl/r/rpl_wait_for_executed_gtid_set_with_sleep.result
 share/mysql/test/suite/rpl/r/rpl_wait_for_gtid_executed_unknown_uuid.result
+share/mysql/test/suite/rpl/r/rpl_writeset_add_unique_key.result
 share/mysql/test/suite/rpl/r/rpl_xa_gap_lock.result
 share/mysql/test/suite/rpl/r/rpl_xa_one_phase_error.result
 share/mysql/test/suite/rpl/r/rpl_xa_prepare.result
@@ -10678,6 +10693,7 @@ share/mysql/test/suite/rpl/t/rpl_mixed_i
 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_row_innodb-master.opt
+share/mysql/test/suite/rpl/t/rpl_mta_rows_query_event_double_free.test
 share/mysql/test/suite/rpl/t/rpl_mts_database_transaction_retry.test
 share/mysql/test/suite/rpl/t/rpl_mts_debug-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_debug.test
@@ -11133,6 +11149,8 @@ share/mysql/test/suite/rpl/t/rpl_show_sl
 share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.test
 share/mysql/test/suite/rpl/t/rpl_show_slave_running.test
 share/mysql/test/suite/rpl/t/rpl_show_slave_status_deadlock.test
+share/mysql/test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config-master.opt
+share/mysql/test/suite/rpl/t/rpl_shutdown_with_optimize_for_static_plugin_config.test
 share/mysql/test/suite/rpl/t/rpl_simulate_create_chunk_failure-slave.opt
 share/mysql/test/suite/rpl/t/rpl_simulate_create_chunk_failure.test
 share/mysql/test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt
@@ -11299,6 +11317,7 @@ share/mysql/test/suite/rpl/t/rpl_wait_fo
 share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set_no_timeout.test
 share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set_with_sleep.test
 share/mysql/test/suite/rpl/t/rpl_wait_for_gtid_executed_unknown_uuid.test
+share/mysql/test/suite/rpl/t/rpl_writeset_add_unique_key.test
 share/mysql/test/suite/rpl/t/rpl_xa_gap_lock.test
 share/mysql/test/suite/rpl/t/rpl_xa_one_phase_error.test
 share/mysql/test/suite/rpl/t/rpl_xa_prepare.test
@@ -14524,6 +14543,8 @@ share/mysql/test/t/ssl_crl_clients_valid
 share/mysql/test/t/ssl_crl_clients_valid.test
 share/mysql/test/t/ssl_crl_crlpath-master.opt
 share/mysql/test/t/ssl_crl_crlpath.test
+share/mysql/test/t/ssl_deprecated_tls_versions-master.opt
+share/mysql/test/t/ssl_deprecated_tls_versions.test
 share/mysql/test/t/ssl_verify_identity-master.opt
 share/mysql/test/t/ssl_verify_identity.test
 share/mysql/test/t/status-master.opt
@@ -14745,6 +14766,7 @@ share/mysql/test/t/wl6661.test
 share/mysql/test/t/wl6711_heap_to_disk.test
 share/mysql/test/t/wl6978.test
 share/mysql/test/t/xa.test
+share/mysql/test/t/xa_deadlock_binlog.test
 share/mysql/test/t/xa_debug.test
 share/mysql/test/t/xa_gtid-master.opt
 share/mysql/test/t/xa_gtid.test