From: Brad Smith <brad@comstyle.com>
Subject: Re: UPDATE: MariaDB 12.3.3
To: ports@openbsd.org
Date: Thu, 3 Sep 2026 16:21:24 -0400

ping.

On 2026-08-27 8:07 p.m., Brad Smith wrote:
> Here is an update to MariaDB 12.3.3.
>
> CVE-2026-47023, CVE-2026-60184, CVE-2026-60331, CVE-2026-60585,
> CVE-2026-60747, CVE-2026-61081
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/mariadb/Makefile,v
> retrieving revision 1.167
> diff -u -p -u -p -r1.167 Makefile
> --- Makefile	29 Jun 2026 11:31:03 -0000	1.167
> +++ Makefile	26 Aug 2026 07:12:03 -0000
> @@ -4,17 +4,16 @@ COMMENT-main=	multithreaded SQL database
>   COMMENT-server=	multithreaded SQL database (server)
>   COMMENT-tests=	multithreaded SQL database (regression test suite/benchmark)
>   
> -VERSION=	12.3.2
> +VERSION=	12.3.3
>   DISTNAME=	mariadb-${VERSION}
>   PKGNAME-main=	mariadb-client-${VERSION}
> -REVISION-tests=	0
>   EPOCH=		1
>   
>   CATEGORIES=	databases
>   SITES=		https://archive.mariadb.org/${DISTNAME}/source/ \
>   		https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
>   
> -FMT_V=		12.1.0
> +FMT_V=		12.2.0
>   DISTFILES.fmt=	fmt-${FMT_V}.zip
>   SITES.fmt=	https://github.com/fmtlib/fmt/releases/download/${FMT_V}/
>   
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/databases/mariadb/distinfo,v
> retrieving revision 1.68
> diff -u -p -u -p -r1.68 distinfo
> --- distinfo	22 Jun 2026 13:44:51 -0000	1.68
> +++ distinfo	26 Aug 2026 07:12:03 -0000
> @@ -1,4 +1,4 @@
> -SHA256 (fmt-12.1.0.zip) = aV/Rl/pa/4/Ge18rvBEEkKh1zfekFoashRL7SA+orac=
> -SHA256 (mariadb-12.3.2.tar.gz) = gnmHFLry80Vu0vMR/IA9wSDyvzuCNY53OEfWKM20tnA=
> -SIZE (fmt-12.1.0.zip) = 1435256
> -SIZE (mariadb-12.3.2.tar.gz) = 120615576
> +SHA256 (fmt-12.2.0.zip) = ovSo1RF4+VTkwzkAf3ft12ugyy42+HpI5aVAPZvlh48=
> +SHA256 (mariadb-12.3.3.tar.gz) = 6Z1zn9SlX5oR3qe9IoeiYmc+KHVQrzBxyEad0r7AwWM=
> +SIZE (fmt-12.2.0.zip) = 1486029
> +SIZE (mariadb-12.3.3.tar.gz) = 222927580
> Index: patches/patch-libmariadb_libmariadb_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 patch-libmariadb_libmariadb_CMakeLists_txt
> --- patches/patch-libmariadb_libmariadb_CMakeLists_txt	13 Jun 2026 06:40:29 -0000	1.21
> +++ patches/patch-libmariadb_libmariadb_CMakeLists_txt	26 Aug 2026 07:12:03 -0000
> @@ -1,7 +1,7 @@
>   Index: libmariadb/libmariadb/CMakeLists.txt
>   --- libmariadb/libmariadb/CMakeLists.txt.orig
>   +++ libmariadb/libmariadb/CMakeLists.txt
> -@@ -477,15 +477,6 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
> +@@ -452,15 +452,6 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
>    # of the config program. To make sure these programs can
>    # use mariadb client library we provide libmysql symlinks
>    
> @@ -14,6 +14,6 @@ Index: libmariadb/libmariadb/CMakeLists.
>   -  ENDIF()
>   -ENDIF()
>   -
> - create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
> -
> - SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
> + # In DEB layout, mariadbclient is already named libmariadb.a — skip the symlink.
> + IF(NOT INSTALL_LAYOUT STREQUAL "DEB")
> +   create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
> Index: patches/patch-libmariadb_libmariadb_secure_openssl_c
> ===================================================================
> RCS file: /cvs/ports/databases/mariadb/patches/patch-libmariadb_libmariadb_secure_openssl_c,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-libmariadb_libmariadb_secure_openssl_c
> --- patches/patch-libmariadb_libmariadb_secure_openssl_c	21 Jan 2026 08:16:22 -0000	1.1
> +++ patches/patch-libmariadb_libmariadb_secure_openssl_c	26 Aug 2026 07:12:03 -0000
> @@ -3,7 +3,7 @@ Avoid use of long-deprecated functions.
>   Index: libmariadb/libmariadb/secure/openssl.c
>   --- libmariadb/libmariadb/secure/openssl.c.orig
>   +++ libmariadb/libmariadb/secure/openssl.c
> -@@ -285,7 +285,6 @@ void ma_tls_end()
> +@@ -397,7 +397,6 @@ void ma_tls_end()
>        {
>          int i;
>          CRYPTO_set_locking_callback(NULL);
> @@ -11,7 +11,7 @@ Index: libmariadb/libmariadb/secure/open
>    
>          for (i=0; i < CRYPTO_num_locks(); i++)
>            pthread_mutex_destroy(&LOCK_crypto[i]);
> -@@ -842,7 +841,7 @@ int ma_tls_verify_server_cert(MARIADB_TLS *ctls, unsig
> +@@ -905,7 +904,7 @@ int ma_tls_verify_server_cert(MARIADB_TLS *ctls, unsig
>          goto error;
>        }
>    
> Index: patches/patch-storage_rocksdb_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 patch-storage_rocksdb_CMakeLists_txt
> --- patches/patch-storage_rocksdb_CMakeLists_txt	15 Nov 2025 23:04:41 -0000	1.8
> +++ patches/patch-storage_rocksdb_CMakeLists_txt	26 Aug 2026 07:12:03 -0000
> @@ -6,7 +6,7 @@ https://jira.mariadb.org/browse/MDEV-298
>   Index: storage/rocksdb/CMakeLists.txt
>   --- storage/rocksdb/CMakeLists.txt.orig
>   +++ storage/rocksdb/CMakeLists.txt
> -@@ -38,6 +38,11 @@ IF(HAVE_AUXV_GETAUXVAL)
> +@@ -34,6 +34,11 @@ IF(HAVE_AUXV_GETAUXVAL)
>      ADD_DEFINITIONS(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
>    ENDIF()
>    
> Index: pkg/PFRAG.le-tests
> ===================================================================
> RCS file: /cvs/ports/databases/mariadb/pkg/PFRAG.le-tests,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PFRAG.le-tests
> --- pkg/PFRAG.le-tests	29 Jun 2026 11:31:03 -0000	1.5
> +++ pkg/PFRAG.le-tests	26 Aug 2026 07:12:04 -0000
> @@ -120,6 +120,7 @@ share/mysql-test/plugin/mroonga/mroonga/
>   share/mysql-test/plugin/mroonga/mroonga/storage/r/auto_increment_text.result
>   share/mysql-test/plugin/mroonga/mroonga/storage/r/binlog_TODO_SPLIT_ME.result
>   share/mysql-test/plugin/mroonga/mroonga/storage/r/check_table_broken.result
> +share/mysql-test/plugin/mroonga/mroonga/storage/r/check_table_innodb.result
>   share/mysql-test/plugin/mroonga/mroonga/storage/r/check_table_not_broken.result
>   share/mysql-test/plugin/mroonga/mroonga/storage/r/collation_utf8_general_ci_french.result
>   share/mysql-test/plugin/mroonga/mroonga/storage/r/collation_utf8_unicode_520_ci_french.result
> @@ -723,6 +724,7 @@ share/mysql-test/plugin/mroonga/mroonga/
>   share/mysql-test/plugin/mroonga/mroonga/storage/t/auto_increment_text.test
>   share/mysql-test/plugin/mroonga/mroonga/storage/t/binlog_TODO_SPLIT_ME.test
>   share/mysql-test/plugin/mroonga/mroonga/storage/t/check_table_broken.test
> +share/mysql-test/plugin/mroonga/mroonga/storage/t/check_table_innodb.test
>   share/mysql-test/plugin/mroonga/mroonga/storage/t/check_table_not_broken.test
>   share/mysql-test/plugin/mroonga/mroonga/storage/t/collation_utf8_general_ci_french.test
>   share/mysql-test/plugin/mroonga/mroonga/storage/t/collation_utf8_unicode_520_ci_french.test
> Index: pkg/PLIST-tests
> ===================================================================
> RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-tests,v
> retrieving revision 1.75
> diff -u -p -u -p -r1.75 PLIST-tests
> --- pkg/PLIST-tests	29 Jun 2026 11:31:03 -0000	1.75
> +++ pkg/PLIST-tests	26 Aug 2026 07:12:06 -0000
> @@ -391,6 +391,7 @@ share/mysql-test/include/have_lowercase1
>   share/mysql-test/include/have_lowercase2.inc
>   share/mysql-test/include/have_maria.inc
>   share/mysql-test/include/have_mariabackup.inc
> +share/mysql-test/include/have_mariabackup_binary.inc
>   share/mysql-test/include/have_max_indexes_128.inc
>   share/mysql-test/include/have_max_indexes_64.inc
>   share/mysql-test/include/have_metadata_lock_info.inc
> @@ -965,6 +966,8 @@ share/mysql-test/main/bind_address_resol
>   share/mysql-test/main/bind_multiple_addresses_resolution.opt
>   share/mysql-test/main/bind_multiple_addresses_resolution.result
>   share/mysql-test/main/bind_multiple_addresses_resolution.test
> +share/mysql-test/main/binlog_invalid_row_v2_tag.result
> +share/mysql-test/main/binlog_invalid_row_v2_tag.test
>   share/mysql-test/main/blackhole.result
>   share/mysql-test/main/blackhole.test
>   share/mysql-test/main/blackhole_plugin.result
> @@ -1674,6 +1677,8 @@ share/mysql-test/main/func_json.result
>   share/mysql-test/main/func_json.test
>   share/mysql-test/main/func_json_notembedded.result
>   share/mysql-test/main/func_json_notembedded.test
> +share/mysql-test/main/func_json_unicode_escape.result
> +share/mysql-test/main/func_json_unicode_escape.test
>   share/mysql-test/main/func_kdf,old.rdiff
>   share/mysql-test/main/func_kdf.combinations
>   share/mysql-test/main/func_kdf.result
> @@ -1823,9 +1828,6 @@ share/mysql-test/main/group_min_max_note
>   share/mysql-test/main/group_min_max_notembedded.test
>   share/mysql-test/main/handler_read_last.result
>   share/mysql-test/main/handler_read_last.test
> -share/mysql-test/main/handlersocket.opt
> -share/mysql-test/main/handlersocket.result
> -share/mysql-test/main/handlersocket.test
>   share/mysql-test/main/having.result
>   share/mysql-test/main/having.test
>   share/mysql-test/main/having_cond_pushdown.result
> @@ -2230,6 +2232,8 @@ share/mysql-test/main/mdev-35765.test
>   share/mysql-test/main/mdev-36094-rowid-filter-reverse-scan.combinations
>   share/mysql-test/main/mdev-36094-rowid-filter-reverse-scan.result
>   share/mysql-test/main/mdev-36094-rowid-filter-reverse-scan.test
> +share/mysql-test/main/mdev-37000.result
> +share/mysql-test/main/mdev-37000.test
>   share/mysql-test/main/mdev13607.result
>   share/mysql-test/main/mdev13607.test
>   share/mysql-test/main/mdev19198.result
> @@ -2711,6 +2715,9 @@ share/mysql-test/main/partition_geometri
>   share/mysql-test/main/partition_geometries.test
>   share/mysql-test/main/partition_grant.result
>   share/mysql-test/main/partition_grant.test
> +share/mysql-test/main/partition_handler.combinations
> +share/mysql-test/main/partition_handler.result
> +share/mysql-test/main/partition_handler.test
>   share/mysql-test/main/partition_hash.result
>   share/mysql-test/main/partition_hash.test
>   share/mysql-test/main/partition_icp.result
> @@ -2806,6 +2813,8 @@ share/mysql-test/main/path_bugs.test
>   share/mysql-test/main/path_ci.opt
>   share/mysql-test/main/path_ci.result
>   share/mysql-test/main/path_ci.test
> +share/mysql-test/main/path_ctype.result
> +share/mysql-test/main/path_ctype.test
>   share/mysql-test/main/path_embed_func.result
>   share/mysql-test/main/path_embed_func.test
>   share/mysql-test/main/path_embed_proc.result
> @@ -2945,6 +2954,8 @@ share/mysql-test/main/query_cache_merge.
>   share/mysql-test/main/query_cache_notembedded-master.opt
>   share/mysql-test/main/query_cache_notembedded.result
>   share/mysql-test/main/query_cache_notembedded.test
> +share/mysql-test/main/query_cache_partition.result
> +share/mysql-test/main/query_cache_partition.test
>   share/mysql-test/main/query_cache_ps_no_prot.result
>   share/mysql-test/main/query_cache_ps_no_prot.test
>   share/mysql-test/main/query_cache_ps_ps_prot.result
> @@ -3005,6 +3016,8 @@ share/mysql-test/main/reset_connection.r
>   share/mysql-test/main/reset_connection.test
>   share/mysql-test/main/reset_slave_all_leaks_master_info.result
>   share/mysql-test/main/reset_slave_all_leaks_master_info.test
> +share/mysql-test/main/rli_run_lock.result
> +share/mysql-test/main/rli_run_lock.test
>   share/mysql-test/main/rollback.result
>   share/mysql-test/main/rollback.test
>   share/mysql-test/main/round.result
> @@ -3040,6 +3053,8 @@ share/mysql-test/main/rpl_mysql_upgrade_
>   share/mysql-test/main/rpl_mysql_upgrade_slave_repo_check.test
>   share/mysql-test/main/rpl_mysqldump_slave.result
>   share/mysql-test/main/rpl_mysqldump_slave.test
> +share/mysql-test/main/rpl_read_info.result
> +share/mysql-test/main/rpl_read_info.test
>   share/mysql-test/main/sargable_casefold.result
>   share/mysql-test/main/sargable_casefold.test
>   share/mysql-test/main/sargable_casefold_notembedded.result
> @@ -3064,6 +3079,8 @@ share/mysql-test/main/select_debug.resul
>   share/mysql-test/main/select_debug.test
>   share/mysql-test/main/select_found.result
>   share/mysql-test/main/select_found.test
> +share/mysql-test/main/select_into_row.result
> +share/mysql-test/main/select_into_row.test
>   share/mysql-test/main/select_jcl6,ps.rdiff
>   share/mysql-test/main/select_jcl6.result
>   share/mysql-test/main/select_jcl6.test
> @@ -3541,10 +3558,10 @@ share/mysql-test/main/table_elim_debug.r
>   share/mysql-test/main/table_elim_debug.test
>   share/mysql-test/main/table_keyinfo-6838.result
>   share/mysql-test/main/table_keyinfo-6838.test
> -share/mysql-test/main/table_options-5867.result
> -share/mysql-test/main/table_options-5867.test
>   share/mysql-test/main/table_options.result
>   share/mysql-test/main/table_options.test
> +share/mysql-test/main/table_options_notembedded.result
> +share/mysql-test/main/table_options_notembedded.test
>   share/mysql-test/main/table_value_constr.result
>   share/mysql-test/main/table_value_constr.test
>   share/mysql-test/main/tablelock.result
> @@ -3569,6 +3586,9 @@ share/mysql-test/main/thread_id_overflow
>   share/mysql-test/main/thread_pool_info.opt
>   share/mysql-test/main/thread_pool_info.result
>   share/mysql-test/main/thread_pool_info.test
> +share/mysql-test/main/thread_stack_overrun.opt
> +share/mysql-test/main/thread_stack_overrun.result
> +share/mysql-test/main/thread_stack_overrun.test
>   share/mysql-test/main/timeout.result
>   share/mysql-test/main/timeout.test
>   share/mysql-test/main/timezone-master.opt
> @@ -3954,12 +3974,14 @@ share/mysql-test/plugin/connect/connect/
>   share/mysql-test/plugin/connect/connect/r/infoschema-9739.result
>   share/mysql-test/plugin/connect/connect/r/infoschema2-9739.result
>   share/mysql-test/plugin/connect/connect/r/ini.result
> +share/mysql-test/plugin/connect/connect/r/ini_alone.result
>   share/mysql-test/plugin/connect/connect/r/ini_grant.result
>   share/mysql-test/plugin/connect/connect/r/jdbc.result
>   share/mysql-test/plugin/connect/connect/r/jdbc_new.result
>   share/mysql-test/plugin/connect/connect/r/jdbc_oracle.result
>   share/mysql-test/plugin/connect/connect/r/jdbc_postgresql.result
>   share/mysql-test/plugin/connect/connect/r/json.result
> +share/mysql-test/plugin/connect/connect/r/json_bson_file_priv.result
>   share/mysql-test/plugin/connect/connect/r/json_java_2.result
>   share/mysql-test/plugin/connect/connect/r/json_java_3.result
>   share/mysql-test/plugin/connect/connect/r/json_mongo_c.result
> @@ -4074,7 +4096,6 @@ share/mysql-test/plugin/connect/connect/
>   share/mysql-test/plugin/connect/connect/t/datest.test
>   share/mysql-test/plugin/connect/connect/t/dbf.test
>   share/mysql-test/plugin/connect/connect/t/dir.test
> -share/mysql-test/plugin/connect/connect/t/drop-open-error.opt
>   share/mysql-test/plugin/connect/connect/t/drop-open-error.test
>   share/mysql-test/plugin/connect/connect/t/endian.test
>   share/mysql-test/plugin/connect/connect/t/fix.test
> @@ -4095,6 +4116,8 @@ share/mysql-test/plugin/connect/connect/
>   share/mysql-test/plugin/connect/connect/t/infoschema-9739.test
>   share/mysql-test/plugin/connect/connect/t/infoschema2-9739.test
>   share/mysql-test/plugin/connect/connect/t/ini.test
> +share/mysql-test/plugin/connect/connect/t/ini_alone.opt
> +share/mysql-test/plugin/connect/connect/t/ini_alone.test
>   share/mysql-test/plugin/connect/connect/t/ini_grant.test
>   share/mysql-test/plugin/connect/connect/t/jdbc.test
>   share/mysql-test/plugin/connect/connect/t/jdbc_new.test
> @@ -4103,6 +4126,8 @@ share/mysql-test/plugin/connect/connect/
>   share/mysql-test/plugin/connect/connect/t/jdbconn.inc
>   share/mysql-test/plugin/connect/connect/t/jdbconn_cleanup.inc
>   share/mysql-test/plugin/connect/connect/t/json.test
> +share/mysql-test/plugin/connect/connect/t/json_bson_file_priv.opt
> +share/mysql-test/plugin/connect/connect/t/json_bson_file_priv.test
>   share/mysql-test/plugin/connect/connect/t/json_java_2.test
>   share/mysql-test/plugin/connect/connect/t/json_java_3.test
>   share/mysql-test/plugin/connect/connect/t/json_mongo_c.test
> @@ -4275,6 +4300,12 @@ share/mysql-test/plugin/func_test/func_t
>   share/mysql-test/plugin/func_test/func_test/strnxfrm_sp_drop.inc
>   share/mysql-test/plugin/func_test/func_test/suite.opt
>   share/mysql-test/plugin/func_test/func_test/suite.pm
> +share/mysql-test/plugin/handler_socket/
> +share/mysql-test/plugin/handler_socket/handlersocket/
> +share/mysql-test/plugin/handler_socket/handlersocket/basic.cnf
> +share/mysql-test/plugin/handler_socket/handlersocket/basic.result
> +share/mysql-test/plugin/handler_socket/handlersocket/basic.test
> +share/mysql-test/plugin/handler_socket/handlersocket/suite.pm
>   share/mysql-test/plugin/hashicorp_key_management/
>   share/mysql-test/plugin/hashicorp_key_management/vault/
>   share/mysql-test/plugin/hashicorp_key_management/vault/include/
> @@ -5863,6 +5894,7 @@ share/mysql-test/plugin/wsrep_info/wsrep
>   share/mysql-test/purify.supp
>   share/mysql-test/std_data/
>   share/mysql-test/std_data/14897.frm
> +share/mysql-test/std_data/MDEV-39816.MYI
>   share/mysql-test/std_data/Moscow_leap
>   share/mysql-test/std_data/autoinc_import_101.frm
>   share/mysql-test/std_data/autoinc_import_57.frm
> @@ -5878,6 +5910,7 @@ share/mysql-test/std_data/bad_row_type.M
>   share/mysql-test/std_data/bad_row_type.frm
>   share/mysql-test/std_data/binlog-header.binlog
>   share/mysql-test/std_data/binlog_before_20574.bin
> +share/mysql-test/std_data/binlog_invalid_row_v2_tag.001
>   share/mysql-test/std_data/binlog_savepoint.000001
>   share/mysql-test/std_data/binlog_transaction.000001
>   share/mysql-test/std_data/bug11747416_32228_binlog.000001
> @@ -5986,6 +6019,9 @@ share/mysql-test/std_data/funcs_1/t3.txt
>   share/mysql-test/std_data/funcs_1/t4.txt
>   share/mysql-test/std_data/funcs_1/t7.txt
>   share/mysql-test/std_data/funcs_1/t9.txt
> +share/mysql-test/std_data/galera-chain-ca.pem
> +share/mysql-test/std_data/galera-chain-cert.pem
> +share/mysql-test/std_data/galera-chain-key.pem
>   share/mysql-test/std_data/galera_certs/
>   share/mysql-test/std_data/galera_certs/INFORMATION
>   share/mysql-test/std_data/galera_certs/galera.1.crt
> @@ -6050,6 +6086,8 @@ share/mysql-test/std_data/mariadb53_temp
>   share/mysql-test/std_data/mariadb53_temporal/mariadb5312_datetime.frm
>   share/mysql-test/std_data/mariadb53_temporal/mariadb5312_time.frm
>   share/mysql-test/std_data/mariadb53_temporal/mariadb5312_timestamp.frm
> +share/mysql-test/std_data/master-10.0.info
> +share/mysql-test/std_data/master-12.3.2.info
>   share/mysql-test/std_data/mdev-25731.dat
>   share/mysql-test/std_data/mdev-37815-fedx-part.frm
>   share/mysql-test/std_data/mdev-37815-fedx-part.par
> @@ -6195,8 +6233,6 @@ share/mysql-test/std_data/mysql_upgrade/
>   share/mysql-test/std_data/mysql_upgrade/v2.frm
>   share/mysql-test/std_data/mysql_upgrade/v3.frm
>   share/mysql-test/std_data/mysql_upgrade/v4.frm
> -share/mysql-test/std_data/new-format-relay-log-win.info
> -share/mysql-test/std_data/new-format-relay-log.info
>   share/mysql-test/std_data/numbers.txt
>   share/mysql-test/std_data/old-format-relay-log-win.info
>   share/mysql-test/std_data/old-format-relay-log.info
> @@ -6207,6 +6243,10 @@ share/mysql-test/std_data/old_decimal/t1
>   share/mysql-test/std_data/old_table-323.frm
>   share/mysql-test/std_data/onerow.xml
>   share/mysql-test/std_data/parts/
> +share/mysql-test/std_data/parts/mysql50#P#p0.MYD
> +share/mysql-test/std_data/parts/mysql50#P#p0.MYI
> +share/mysql-test/std_data/parts/mysql50.frm
> +share/mysql-test/std_data/parts/mysql50.par
>   share/mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc
>   share/mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc
>   share/mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc
> @@ -6224,6 +6264,10 @@ share/mysql-test/std_data/parts/t1_will_
>   share/mysql-test/std_data/parts/t1_will_crash#P#p6.MYD
>   share/mysql-test/std_data/parts/t1_will_crash#P#p6_2.MYD
>   share/mysql-test/std_data/parts/t1_will_crash#P#p6_3.MYD
> +share/mysql-test/std_data/relay-log-10.0-win.info
> +share/mysql-test/std_data/relay-log-10.0.info
> +share/mysql-test/std_data/relay-log-12.3.2-win.info
> +share/mysql-test/std_data/relay-log-12.3.2.info
>   share/mysql-test/std_data/rpl/
>   share/mysql-test/std_data/rpl/master-bin-seq_10.3.36.000001
>   share/mysql-test/std_data/rpl/mysql-5.7.11-stm-temporal-round-binlog.000001
> @@ -6327,6 +6371,8 @@ share/mysql-test/suite/archive/partition
>   share/mysql-test/suite/archive/partition_archive.test
>   share/mysql-test/suite/archive/repair.result
>   share/mysql-test/suite/archive/repair.test
> +share/mysql-test/suite/archive/repair_text.result
> +share/mysql-test/suite/archive/repair_text.test
>   share/mysql-test/suite/archive/rnd_pos.result
>   share/mysql-test/suite/archive/rnd_pos.test
>   share/mysql-test/suite/archive/suite.pm
> @@ -6577,6 +6623,7 @@ share/mysql-test/suite/binlog/r/binlog_x
>   share/mysql-test/suite/binlog/r/binlog_xa_recover.result
>   share/mysql-test/suite/binlog/r/binlog_xa_recover_using_new_server_id.result
>   share/mysql-test/suite/binlog/r/create_like.result
> +share/mysql-test/suite/binlog/r/fdle_overflow.result
>   share/mysql-test/suite/binlog/r/flashback-largebinlog.result
>   share/mysql-test/suite/binlog/r/flashback.result
>   share/mysql-test/suite/binlog/r/foreign_key.result
> @@ -6592,7 +6639,9 @@ share/mysql-test/suite/binlog/r/start_al
>   share/mysql-test/suite/binlog/r/temptable_uservar_disconnect-7938.result
>   share/mysql-test/suite/binlog/r/type_datetime_func_current_timestamp.result
>   share/mysql-test/suite/binlog/r/type_timestamp_func_current_timestamp.result
> +share/mysql-test/suite/binlog/r/unknown_log_event.result
>   share/mysql-test/suite/binlog/std_data/
> +share/mysql-test/suite/binlog/std_data/invalid_row_v2_tag.001
>   share/mysql-test/suite/binlog/std_data/update-full-row.binlog
>   share/mysql-test/suite/binlog/std_data/update-partial-row.binlog
>   share/mysql-test/suite/binlog/std_data/write-full-row.binlog
> @@ -6789,6 +6838,7 @@ share/mysql-test/suite/binlog/t/binlog_x
>   share/mysql-test/suite/binlog/t/binlog_xa_recover.test
>   share/mysql-test/suite/binlog/t/binlog_xa_recover_using_new_server_id.test
>   share/mysql-test/suite/binlog/t/create_like.test
> +share/mysql-test/suite/binlog/t/fdle_overflow.test
>   share/mysql-test/suite/binlog/t/flashback-largebinlog.test
>   share/mysql-test/suite/binlog/t/flashback-master.opt
>   share/mysql-test/suite/binlog/t/flashback.combinations
> @@ -6809,6 +6859,7 @@ share/mysql-test/suite/binlog/t/start_al
>   share/mysql-test/suite/binlog/t/temptable_uservar_disconnect-7938.test
>   share/mysql-test/suite/binlog/t/type_datetime_func_current_timestamp.test
>   share/mysql-test/suite/binlog/t/type_timestamp_func_current_timestamp.test
> +share/mysql-test/suite/binlog/t/unknown_log_event.test
>   share/mysql-test/suite/binlog_encryption/
>   share/mysql-test/suite/binlog_encryption/binlog_incident.combinations
>   share/mysql-test/suite/binlog_encryption/binlog_incident.result
> @@ -7338,6 +7389,8 @@ share/mysql-test/suite/csv/csv_alter_tab
>   share/mysql-test/suite/csv/csv_alter_table.test
>   share/mysql-test/suite/csv/csv_not_null.result
>   share/mysql-test/suite/csv/csv_not_null.test
> +share/mysql-test/suite/csv/delete.result
> +share/mysql-test/suite/csv/delete.test
>   share/mysql-test/suite/csv/flush.result
>   share/mysql-test/suite/csv/flush.test
>   share/mysql-test/suite/csv/lowercase_table0.result
> @@ -7379,7 +7432,6 @@ share/mysql-test/suite/encryption/r/file
>   share/mysql-test/suite/encryption/r/filekeys_named_pipe.result
>   share/mysql-test/suite/encryption/r/filekeys_nofile.result
>   share/mysql-test/suite/encryption/r/filekeys_secret_openssl_rand_128bits.result
> -share/mysql-test/suite/encryption/r/filekeys_secret_too_long.result
>   share/mysql-test/suite/encryption/r/filekeys_syntax.result
>   share/mysql-test/suite/encryption/r/filekeys_tooshort.result
>   share/mysql-test/suite/encryption/r/filekeys_unencfile.result
> @@ -7474,7 +7526,6 @@ share/mysql-test/suite/encryption/t/file
>   share/mysql-test/suite/encryption/t/filekeys-data-sha384.enc
>   share/mysql-test/suite/encryption/t/filekeys-data-sha512-pbkdf2.enc
>   share/mysql-test/suite/encryption/t/filekeys-data-sha512.enc
> -share/mysql-test/suite/encryption/t/filekeys-data-too-long.key
>   share/mysql-test/suite/encryption/t/filekeys-data.enc
>   share/mysql-test/suite/encryption/t/filekeys-data.key
>   share/mysql-test/suite/encryption/t/filekeys-tooshort.enc
> @@ -7504,8 +7555,6 @@ share/mysql-test/suite/encryption/t/file
>   share/mysql-test/suite/encryption/t/filekeys_secret_openssl_rand_128bits.key
>   share/mysql-test/suite/encryption/t/filekeys_secret_openssl_rand_128bits.opt
>   share/mysql-test/suite/encryption/t/filekeys_secret_openssl_rand_128bits.test
> -share/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
> -share/mysql-test/suite/encryption/t/filekeys_secret_too_long.test
>   share/mysql-test/suite/encryption/t/filekeys_syntax.opt
>   share/mysql-test/suite/encryption/t/filekeys_syntax.test
>   share/mysql-test/suite/encryption/t/filekeys_tooshort.opt
> @@ -9009,6 +9058,7 @@ share/mysql-test/suite/galera/include/ga
>   share/mysql-test/suite/galera/include/galera_start_replication.inc
>   share/mysql-test/suite/galera/include/galera_stop_replication.inc
>   share/mysql-test/suite/galera/include/galera_wsrep_recover.inc
> +share/mysql-test/suite/galera/include/have_pkill.inc
>   share/mysql-test/suite/galera/include/have_qpress.inc
>   share/mysql-test/suite/galera/include/have_stunnel.inc
>   share/mysql-test/suite/galera/include/kill_galera.inc
> @@ -9079,6 +9129,7 @@ share/mysql-test/suite/galera/r/MDEV-338
>   share/mysql-test/suite/galera/r/MDEV-34117.result
>   share/mysql-test/suite/galera/r/MDEV-34594.result
>   share/mysql-test/suite/galera/r/MDEV-34647.result
> +share/mysql-test/suite/galera/r/MDEV-34784.result
>   share/mysql-test/suite/galera/r/MDEV-35018.result
>   share/mysql-test/suite/galera/r/MDEV-35446.result
>   share/mysql-test/suite/galera/r/MDEV-35511.result
> @@ -9095,6 +9146,7 @@ share/mysql-test/suite/galera/r/MDEV-379
>   share/mysql-test/suite/galera/r/MDEV-37991.result
>   share/mysql-test/suite/galera/r/MDEV-38073.result
>   share/mysql-test/suite/galera/r/MDEV-38201.result
> +share/mysql-test/suite/galera/r/MDEV-38260.result
>   share/mysql-test/suite/galera/r/MDEV-39011.result
>   share/mysql-test/suite/galera/r/MDEV-39685.result
>   share/mysql-test/suite/galera/r/MDEV-6860.result
> @@ -9164,13 +9216,13 @@ share/mysql-test/suite/galera/r/galera_b
>   share/mysql-test/suite/galera/r/galera_bf_abort_get_lock.result
>   share/mysql-test/suite/galera/r/galera_bf_abort_lock_table.result
>   share/mysql-test/suite/galera/r/galera_bf_abort_mariabackup.result
> +share/mysql-test/suite/galera/r/galera_bf_abort_orphan_lock.result
>   share/mysql-test/suite/galera/r/galera_bf_abort_ps.result
>   share/mysql-test/suite/galera/r/galera_bf_abort_ps_bind.result
>   share/mysql-test/suite/galera/r/galera_bf_abort_ps_threadpool.result
>   share/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result
>   share/mysql-test/suite/galera/r/galera_bf_abort_sleep.result
>   share/mysql-test/suite/galera/r/galera_bf_background_statistics.result
> -share/mysql-test/suite/galera/r/galera_bf_kill,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_bf_kill.result
>   share/mysql-test/suite/galera/r/galera_bf_kill_debug.result
>   share/mysql-test/suite/galera/r/galera_bf_lock_wait.result
> @@ -9357,9 +9409,11 @@ share/mysql-test/suite/galera/r/galera_s
>   share/mysql-test/suite/galera/r/galera_ssl.result
>   share/mysql-test/suite/galera/r/galera_ssl_cipher.result
>   share/mysql-test/suite/galera/r/galera_ssl_upgrade.result
> +share/mysql-test/suite/galera/r/galera_sst_cn_injection.result
>   share/mysql-test/suite/galera/r/galera_sst_encrypted.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup.result
> +share/mysql-test/suite/galera/r/galera_sst_mariabackup_ca_chain.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_data_dir,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_data_dir.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_encrypt_with_key-openssl.result
> @@ -9372,11 +9426,15 @@ share/mysql-test/suite/galera/r/galera_s
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_lost_found.result
> +share/mysql-test/suite/galera/r/galera_sst_mariabackup_missing_ssl.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_no_auth,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_no_auth.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_qpress.result
> +share/mysql-test/suite/galera/r/galera_sst_mariabackup_ssl_role_certs.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result
>   share/mysql-test/suite/galera/r/galera_sst_mariabackup_use_memory.result
> +share/mysql-test/suite/galera/r/galera_sst_mariabackup_verify_ca,debug.rdiff
> +share/mysql-test/suite/galera/r/galera_sst_mariabackup_verify_ca.result
>   share/mysql-test/suite/galera/r/galera_sst_mysqldump.result
>   share/mysql-test/suite/galera/r/galera_sst_mysqldump_debug.result
>   share/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result
> @@ -9391,14 +9449,15 @@ share/mysql-test/suite/galera/r/galera_s
>   share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_capath.result
>   share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_key,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_key.result
> -share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_key_server.result
>   share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_server,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_server.result
>   share/mysql-test/suite/galera/r/galera_sst_rsync_gtid,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_rsync_gtid.result
>   share/mysql-test/suite/galera/r/galera_sst_rsync_logbasename.result
> +share/mysql-test/suite/galera/r/galera_sst_rsync_missing_stunnel.result
>   share/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto,debug.rdiff
>   share/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto.result
> +share/mysql-test/suite/galera/r/galera_sst_rsync_ssl_role_certs.result
>   share/mysql-test/suite/galera/r/galera_status_cluster.result
>   share/mysql-test/suite/galera/r/galera_status_local_index.result
>   share/mysql-test/suite/galera/r/galera_status_local_state.result
> @@ -9618,6 +9677,7 @@ share/mysql-test/suite/galera/t/MDEV-341
>   share/mysql-test/suite/galera/t/MDEV-34594.test
>   share/mysql-test/suite/galera/t/MDEV-34647.cnf
>   share/mysql-test/suite/galera/t/MDEV-34647.test
> +share/mysql-test/suite/galera/t/MDEV-34784.test
>   share/mysql-test/suite/galera/t/MDEV-35018.test
>   share/mysql-test/suite/galera/t/MDEV-35446.cnf
>   share/mysql-test/suite/galera/t/MDEV-35446.test
> @@ -9638,6 +9698,8 @@ share/mysql-test/suite/galera/t/MDEV-379
>   share/mysql-test/suite/galera/t/MDEV-37991.test
>   share/mysql-test/suite/galera/t/MDEV-38073.test
>   share/mysql-test/suite/galera/t/MDEV-38201.test
> +share/mysql-test/suite/galera/t/MDEV-38260.cnf
> +share/mysql-test/suite/galera/t/MDEV-38260.test
>   share/mysql-test/suite/galera/t/MDEV-39011.cnf
>   share/mysql-test/suite/galera/t/MDEV-39011.test
>   share/mysql-test/suite/galera/t/MDEV-39685.test
> @@ -9744,6 +9806,7 @@ share/mysql-test/suite/galera/t/galera_b
>   share/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
>   share/mysql-test/suite/galera/t/galera_bf_abort_mariabackup.cnf
>   share/mysql-test/suite/galera/t/galera_bf_abort_mariabackup.test
> +share/mysql-test/suite/galera/t/galera_bf_abort_orphan_lock.test
>   share/mysql-test/suite/galera/t/galera_bf_abort_ps.cnf
>   share/mysql-test/suite/galera/t/galera_bf_abort_ps.test
>   share/mysql-test/suite/galera/t/galera_bf_abort_ps_bind.cnf
> @@ -10017,18 +10080,21 @@ share/mysql-test/suite/galera/t/galera_s
>   share/mysql-test/suite/galera/t/galera_ssl_cipher.test
>   share/mysql-test/suite/galera/t/galera_ssl_upgrade.cnf
>   share/mysql-test/suite/galera/t/galera_ssl_upgrade.test
> +share/mysql-test/suite/galera/t/galera_sst_cn_injection.cnf
> +share/mysql-test/suite/galera/t/galera_sst_cn_injection.combinations
> +share/mysql-test/suite/galera/t/galera_sst_cn_injection.test
>   share/mysql-test/suite/galera/t/galera_sst_encrypted.cnf
>   share/mysql-test/suite/galera/t/galera_sst_encrypted.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup.test
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_ca_chain.cnf
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_ca_chain.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_data_dir.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_data_dir.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key-openssl.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key-openssl.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.test
> -share/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.cnf
> -share/mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_force_recovery-master.opt
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_force_recovery.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_force_recovery.test
> @@ -10038,14 +10104,20 @@ share/mysql-test/suite/galera/t/galera_s
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_logarchive.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.test
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_missing_ssl.cnf
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_missing_ssl.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_no_auth.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_no_auth.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_qpress.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_qpress.test
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_ssl_role_certs.cnf
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_ssl_role_certs.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mariabackup_use_memory.test
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_verify_ca.cnf
> +share/mysql-test/suite/galera/t/galera_sst_mariabackup_verify_ca.test
>   share/mysql-test/suite/galera/t/galera_sst_mysqldump.cnf
>   share/mysql-test/suite/galera/t/galera_sst_mysqldump.test
>   share/mysql-test/suite/galera/t/galera_sst_mysqldump_debug.cnf
> @@ -10064,16 +10136,18 @@ share/mysql-test/suite/galera/t/galera_s
>   share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_capath.test
>   share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key.cnf
>   share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key.test
> -share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key_server.cnf
> -share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key_server.test
>   share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.cnf
>   share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.test
>   share/mysql-test/suite/galera/t/galera_sst_rsync_gtid.cnf
>   share/mysql-test/suite/galera/t/galera_sst_rsync_gtid.test
>   share/mysql-test/suite/galera/t/galera_sst_rsync_logbasename.cnf
>   share/mysql-test/suite/galera/t/galera_sst_rsync_logbasename.test
> +share/mysql-test/suite/galera/t/galera_sst_rsync_missing_stunnel.cnf
> +share/mysql-test/suite/galera/t/galera_sst_rsync_missing_stunnel.test
>   share/mysql-test/suite/galera/t/galera_sst_rsync_recv_auto.cnf
>   share/mysql-test/suite/galera/t/galera_sst_rsync_recv_auto.test
> +share/mysql-test/suite/galera/t/galera_sst_rsync_ssl_role_certs.cnf
> +share/mysql-test/suite/galera/t/galera_sst_rsync_ssl_role_certs.test
>   share/mysql-test/suite/galera/t/galera_status_cluster.test
>   share/mysql-test/suite/galera/t/galera_status_local_index.test
>   share/mysql-test/suite/galera/t/galera_status_local_state.test
> @@ -10266,6 +10340,11 @@ share/mysql-test/suite/galera_3nodes/r/G
>   share/mysql-test/suite/galera_3nodes/r/GCF-376.result
>   share/mysql-test/suite/galera_3nodes/r/MDEV-29171.result
>   share/mysql-test/suite/galera_3nodes/r/MDEV-36360.result
> +share/mysql-test/suite/galera_3nodes/r/MDEV-38147.result
> +share/mysql-test/suite/galera_3nodes/r/MDEV-38147_binlogdir.result
> +share/mysql-test/suite/galera_3nodes/r/MDEV-38843.result
> +share/mysql-test/suite/galera_3nodes/r/MDEV-40179.result
> +share/mysql-test/suite/galera_3nodes/r/MDEV-40179_nobinlog.result
>   share/mysql-test/suite/galera_3nodes/r/galera-features#115.result
>   share/mysql-test/suite/galera_3nodes/r/galera-features#119.result
>   share/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
> @@ -10316,6 +10395,19 @@ share/mysql-test/suite/galera_3nodes/t/G
>   share/mysql-test/suite/galera_3nodes/t/MDEV-29171.cnf
>   share/mysql-test/suite/galera_3nodes/t/MDEV-29171.test
>   share/mysql-test/suite/galera_3nodes/t/MDEV-36360.test
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38147.cnf
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38147.test
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38147_binlogdir.cnf
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38147_binlogdir.test
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38147_gtid_off.cnf
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38147_gtid_off.test
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38843.cnf
> +share/mysql-test/suite/galera_3nodes/t/MDEV-38843.test
> +share/mysql-test/suite/galera_3nodes/t/MDEV-40179.cnf
> +share/mysql-test/suite/galera_3nodes/t/MDEV-40179.inc
> +share/mysql-test/suite/galera_3nodes/t/MDEV-40179.test
> +share/mysql-test/suite/galera_3nodes/t/MDEV-40179_nobinlog.cnf
> +share/mysql-test/suite/galera_3nodes/t/MDEV-40179_nobinlog.test
>   share/mysql-test/suite/galera_3nodes/t/galera-features#115.cnf
>   share/mysql-test/suite/galera_3nodes/t/galera-features#115.test
>   share/mysql-test/suite/galera_3nodes/t/galera-features#119.test
> @@ -10893,7 +10985,6 @@ share/mysql-test/suite/innodb/r/alter_ta
>   share/mysql-test/suite/innodb/r/alter_table_upgrade.result
>   share/mysql-test/suite/innodb/r/alter_temp_fail.result
>   share/mysql-test/suite/innodb/r/alter_varchar_change.result
> -share/mysql-test/suite/innodb/r/analyze_table.result
>   share/mysql-test/suite/innodb/r/auto_increment_dup.result
>   share/mysql-test/suite/innodb/r/auto_increment_lock_mode.result
>   share/mysql-test/suite/innodb/r/autoinc_debug.result
> @@ -10917,6 +11008,7 @@ share/mysql-test/suite/innodb/r/check_ib
>   share/mysql-test/suite/innodb/r/check_ibd_filesize.result
>   share/mysql-test/suite/innodb/r/check_sequence,debug.rdiff
>   share/mysql-test/suite/innodb/r/check_sequence.result
> +share/mysql-test/suite/innodb/r/compression_providers_installed.result
>   share/mysql-test/suite/innodb/r/compression_providers_loaded,lz4.rdiff
>   share/mysql-test/suite/innodb/r/compression_providers_loaded,lzma.rdiff
>   share/mysql-test/suite/innodb/r/compression_providers_loaded,lzo.rdiff
> @@ -10943,6 +11035,7 @@ share/mysql-test/suite/innodb/r/deadlock
>   share/mysql-test/suite/innodb/r/deadlock_in_subqueries_join.result
>   share/mysql-test/suite/innodb/r/deadlock_on_lock_upgrade.result
>   share/mysql-test/suite/innodb/r/deadlock_report.result
> +share/mysql-test/suite/innodb/r/deadlock_report2.result
>   share/mysql-test/suite/innodb/r/deadlock_victim_race.result
>   share/mysql-test/suite/innodb/r/deadlock_wait_lock_race.result
>   share/mysql-test/suite/innodb/r/deadlock_wait_thr_race.result
> @@ -10953,6 +11046,7 @@ share/mysql-test/suite/innodb/r/default_
>   share/mysql-test/suite/innodb/r/default_row_format_create,dynamic.rdiff
>   share/mysql-test/suite/innodb/r/default_row_format_create,redundant.rdiff
>   share/mysql-test/suite/innodb/r/default_row_format_create.result
> +share/mysql-test/suite/innodb/r/dml_function.result
>   share/mysql-test/suite/innodb/r/doublewrite.result
>   share/mysql-test/suite/innodb/r/doublewrite_debug.result
>   share/mysql-test/suite/innodb/r/dropdb.result
> @@ -10998,6 +11092,8 @@ share/mysql-test/suite/innodb/r/import_r
>   share/mysql-test/suite/innodb/r/import_tablespace_race.result
>   share/mysql-test/suite/innodb/r/import_update_stats.result
>   share/mysql-test/suite/innodb/r/index_length.result
> +share/mysql-test/suite/innodb/r/index_lock_upgrade,off.rdiff
> +share/mysql-test/suite/innodb/r/index_lock_upgrade.result
>   share/mysql-test/suite/innodb/r/index_merge_threshold.result
>   share/mysql-test/suite/innodb/r/index_tree_operation.result
>   share/mysql-test/suite/innodb/r/index_vcol_purge_startup.result
> @@ -11289,6 +11385,7 @@ share/mysql-test/suite/innodb/r/mem_pres
>   share/mysql-test/suite/innodb/r/missing_tablespaces.result
>   share/mysql-test/suite/innodb/r/mon_lock_wait_current_count.result
>   share/mysql-test/suite/innodb/r/monitor.result
> +share/mysql-test/suite/innodb/r/msan_failure.result
>   share/mysql-test/suite/innodb/r/multi_repair-7404.result
>   share/mysql-test/suite/innodb/r/mvcc.result
>   share/mysql-test/suite/innodb/r/mvcc_secondary.result
> @@ -11332,6 +11429,7 @@ share/mysql-test/suite/innodb/r/stored_f
>   share/mysql-test/suite/innodb/r/strict_mode.result
>   share/mysql-test/suite/innodb/r/sys_defragment.result
>   share/mysql-test/suite/innodb/r/sys_defragment_fail.result
> +share/mysql-test/suite/innodb/r/sys_defragment_root.result
>   share/mysql-test/suite/innodb/r/sys_truncate.result
>   share/mysql-test/suite/innodb/r/sys_truncate_debug.result
>   share/mysql-test/suite/innodb/r/sys_truncate_large.result
> @@ -11428,7 +11526,6 @@ share/mysql-test/suite/innodb/t/alter_ta
>   share/mysql-test/suite/innodb/t/alter_temp_fail.opt
>   share/mysql-test/suite/innodb/t/alter_temp_fail.test
>   share/mysql-test/suite/innodb/t/alter_varchar_change.test
> -share/mysql-test/suite/innodb/t/analyze_table.test
>   share/mysql-test/suite/innodb/t/auto_increment_dup.opt
>   share/mysql-test/suite/innodb/t/auto_increment_dup.test
>   share/mysql-test/suite/innodb/t/auto_increment_lock_mode.combinations
> @@ -11451,6 +11548,7 @@ share/mysql-test/suite/innodb/t/cascade_
>   share/mysql-test/suite/innodb/t/change_column_collation.test
>   share/mysql-test/suite/innodb/t/check_ibd_filesize.test
>   share/mysql-test/suite/innodb/t/check_sequence.test
> +share/mysql-test/suite/innodb/t/compression_providers_installed.test
>   share/mysql-test/suite/innodb/t/compression_providers_loaded.combinations
>   share/mysql-test/suite/innodb/t/compression_providers_loaded.test
>   share/mysql-test/suite/innodb/t/compression_providers_unloaded.combinations
> @@ -11474,6 +11572,7 @@ share/mysql-test/suite/innodb/t/deadlock
>   share/mysql-test/suite/innodb/t/deadlock_in_subqueries_join.test
>   share/mysql-test/suite/innodb/t/deadlock_on_lock_upgrade.test
>   share/mysql-test/suite/innodb/t/deadlock_report.test
> +share/mysql-test/suite/innodb/t/deadlock_report2.test
>   share/mysql-test/suite/innodb/t/deadlock_victim_race.test
>   share/mysql-test/suite/innodb/t/deadlock_wait_lock_race.opt
>   share/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test
> @@ -11482,6 +11581,7 @@ share/mysql-test/suite/innodb/t/deadlock
>   share/mysql-test/suite/innodb/t/default_row_format_alter.test
>   share/mysql-test/suite/innodb/t/default_row_format_compatibility.test
>   share/mysql-test/suite/innodb/t/default_row_format_create.test
> +share/mysql-test/suite/innodb/t/dml_function.test
>   share/mysql-test/suite/innodb/t/doublewrite.combinations
>   share/mysql-test/suite/innodb/t/doublewrite.test
>   share/mysql-test/suite/innodb/t/doublewrite_debug.combinations
> @@ -11536,6 +11636,8 @@ share/mysql-test/suite/innodb/t/import_r
>   share/mysql-test/suite/innodb/t/import_tablespace_race.test
>   share/mysql-test/suite/innodb/t/import_update_stats.test
>   share/mysql-test/suite/innodb/t/index_length.test
> +share/mysql-test/suite/innodb/t/index_lock_upgrade.combinations
> +share/mysql-test/suite/innodb/t/index_lock_upgrade.test
>   share/mysql-test/suite/innodb/t/index_merge_threshold.opt
>   share/mysql-test/suite/innodb/t/index_merge_threshold.test
>   share/mysql-test/suite/innodb/t/index_tree_operation.opt
> @@ -11865,6 +11967,7 @@ share/mysql-test/suite/innodb/t/mem_pres
>   share/mysql-test/suite/innodb/t/missing_tablespaces.test
>   share/mysql-test/suite/innodb/t/mon_lock_wait_current_count.test
>   share/mysql-test/suite/innodb/t/monitor.test
> +share/mysql-test/suite/innodb/t/msan_failure.test
>   share/mysql-test/suite/innodb/t/multi_repair-7404.test
>   share/mysql-test/suite/innodb/t/mvcc.test
>   share/mysql-test/suite/innodb/t/mvcc_secondary.test
> @@ -11917,6 +12020,8 @@ share/mysql-test/suite/innodb/t/sys_defr
>   share/mysql-test/suite/innodb/t/sys_defragment.test
>   share/mysql-test/suite/innodb/t/sys_defragment_fail.opt
>   share/mysql-test/suite/innodb/t/sys_defragment_fail.test
> +share/mysql-test/suite/innodb/t/sys_defragment_root.opt
> +share/mysql-test/suite/innodb/t/sys_defragment_root.test
>   share/mysql-test/suite/innodb/t/sys_truncate.opt
>   share/mysql-test/suite/innodb/t/sys_truncate.test
>   share/mysql-test/suite/innodb/t/sys_truncate_debug.opt
> @@ -14821,6 +14926,7 @@ share/mysql-test/suite/plugins/r/qc_info
>   share/mysql-test/suite/plugins/r/rpl_auth.result
>   share/mysql-test/suite/plugins/r/server_audit.result
>   share/mysql-test/suite/plugins/r/server_audit_buffering.result
> +share/mysql-test/suite/plugins/r/server_audit_bugs.result
>   share/mysql-test/suite/plugins/r/server_audit_pwd_mask.result
>   share/mysql-test/suite/plugins/r/server_audit_query_id.result
>   share/mysql-test/suite/plugins/r/show_all_plugins.result
> @@ -14884,6 +14990,7 @@ share/mysql-test/suite/plugins/t/server_
>   share/mysql-test/suite/plugins/t/server_audit.test
>   share/mysql-test/suite/plugins/t/server_audit_buffering.opt
>   share/mysql-test/suite/plugins/t/server_audit_buffering.test
> +share/mysql-test/suite/plugins/t/server_audit_bugs.test
>   share/mysql-test/suite/plugins/t/server_audit_pwd_mask.test
>   share/mysql-test/suite/plugins/t/server_audit_query_id.opt
>   share/mysql-test/suite/plugins/t/server_audit_query_id.test
> @@ -15235,9 +15342,11 @@ share/mysql-test/suite/rpl/r/rpl_circula
>   share/mysql-test/suite/rpl/r/rpl_circular_semi_sync.result
>   share/mysql-test/suite/rpl/r/rpl_colSize.result
>   share/mysql-test/suite/rpl/r/rpl_commit_after_flush.result
> +share/mysql-test/suite/rpl/r/rpl_compressed_log_event_overflow.result
>   share/mysql-test/suite/rpl/r/rpl_concurrency_error.result
>   share/mysql-test/suite/rpl/r/rpl_conditional_comments.result
>   share/mysql-test/suite/rpl/r/rpl_connection.result
> +share/mysql-test/suite/rpl/r/rpl_corrupted_decimal_precision.result
>   share/mysql-test/suite/rpl/r/rpl_corruption.result
>   share/mysql-test/suite/rpl/r/rpl_crash_ddl_master.result
>   share/mysql-test/suite/rpl/r/rpl_create_database.result
> @@ -15353,6 +15462,7 @@ share/mysql-test/suite/rpl/r/rpl_heartbe
>   share/mysql-test/suite/rpl/r/rpl_heartbeat_at_rotate.result
>   share/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
>   share/mysql-test/suite/rpl/r/rpl_heartbeat_debug.result
> +share/mysql-test/suite/rpl/r/rpl_heartbeat_log_event_underflow.result
>   share/mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result
>   share/mysql-test/suite/rpl/r/rpl_hrtime.result
>   share/mysql-test/suite/rpl/r/rpl_hrtime_row.result
> @@ -15523,14 +15633,15 @@ share/mysql-test/suite/rpl/r/rpl_perfsch
>   share/mysql-test/suite/rpl/r/rpl_plugin_load.result
>   share/mysql-test/suite/rpl/r/rpl_ps.result
>   share/mysql-test/suite/rpl/r/rpl_query_cache.result
> +share/mysql-test/suite/rpl/r/rpl_queue_event_length_mismatch.result
>   share/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
> -share/mysql-test/suite/rpl/r/rpl_read_new_relay_log_info.result
>   share/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result
>   share/mysql-test/suite/rpl/r/rpl_read_only.result
>   share/mysql-test/suite/rpl/r/rpl_read_only2.result
>   share/mysql-test/suite/rpl/r/rpl_relay_max_extension.result
>   share/mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
>   share/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
> +share/mysql-test/suite/rpl/r/rpl_relaylog_corruption.result
>   share/mysql-test/suite/rpl/r/rpl_relayrotate.result
>   share/mysql-test/suite/rpl/r/rpl_relayspace.result
>   share/mysql-test/suite/rpl/r/rpl_reopen_temp_table.result
> @@ -15546,6 +15657,8 @@ share/mysql-test/suite/rpl/r/rpl_retry_c
>   share/mysql-test/suite/rpl/r/rpl_retry_count_reconnect_limit_times.result
>   share/mysql-test/suite/rpl/r/rpl_rewrite_db_sys_vars.result
>   share/mysql-test/suite/rpl/r/rpl_rewrt_db.result
> +share/mysql-test/suite/rpl/r/rpl_rotate_ev_overflow.result
> +share/mysql-test/suite/rpl/r/rpl_rotate_log_event_overflow.result
>   share/mysql-test/suite/rpl/r/rpl_rotate_logs.result
>   share/mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
>   share/mysql-test/suite/rpl/r/rpl_row_001.result
> @@ -15763,6 +15876,9 @@ share/mysql-test/suite/rpl/r/rpl_strict_
>   share/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
>   share/mysql-test/suite/rpl/r/rpl_sync.result
>   share/mysql-test/suite/rpl/r/rpl_system_versioning_partitions.result
> +share/mysql-test/suite/rpl/r/rpl_table_map_log_event_overflow.result
> +share/mysql-test/suite/rpl/r/rpl_table_map_metadata_underflow.result
> +share/mysql-test/suite/rpl/r/rpl_table_map_name_overflow.result
>   share/mysql-test/suite/rpl/r/rpl_table_options.result
>   share/mysql-test/suite/rpl/r/rpl_temp_table.result
>   share/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.opt
> @@ -15802,6 +15918,7 @@ share/mysql-test/suite/rpl/r/rpl_user_va
>   share/mysql-test/suite/rpl/r/rpl_using_gtid_default.result
>   share/mysql-test/suite/rpl/r/rpl_variables.result
>   share/mysql-test/suite/rpl/r/rpl_variables_stm.result
> +share/mysql-test/suite/rpl/r/rpl_vcol_row.result
>   share/mysql-test/suite/rpl/r/rpl_view.result
>   share/mysql-test/suite/rpl/r/rpl_view_debug.result
>   share/mysql-test/suite/rpl/r/rpl_view_multi.result
> @@ -15949,10 +16066,13 @@ share/mysql-test/suite/rpl/t/rpl_circula
>   share/mysql-test/suite/rpl/t/rpl_circular_semi_sync.test
>   share/mysql-test/suite/rpl/t/rpl_colSize.test
>   share/mysql-test/suite/rpl/t/rpl_commit_after_flush.test
> +share/mysql-test/suite/rpl/t/rpl_compressed_log_event_overflow-master.opt
> +share/mysql-test/suite/rpl/t/rpl_compressed_log_event_overflow.test
>   share/mysql-test/suite/rpl/t/rpl_concurrency_error-master.opt
>   share/mysql-test/suite/rpl/t/rpl_concurrency_error.test
>   share/mysql-test/suite/rpl/t/rpl_conditional_comments.test
>   share/mysql-test/suite/rpl/t/rpl_connection.test
> +share/mysql-test/suite/rpl/t/rpl_corrupted_decimal_precision.test
>   share/mysql-test/suite/rpl/t/rpl_corruption-master.opt
>   share/mysql-test/suite/rpl/t/rpl_corruption-slave.opt
>   share/mysql-test/suite/rpl/t/rpl_corruption.test
> @@ -16104,6 +16224,8 @@ share/mysql-test/suite/rpl/t/rpl_heartbe
>   share/mysql-test/suite/rpl/t/rpl_heartbeat_basic.cnf
>   share/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
>   share/mysql-test/suite/rpl/t/rpl_heartbeat_debug.test
> +share/mysql-test/suite/rpl/t/rpl_heartbeat_log_event_underflow-master.opt
> +share/mysql-test/suite/rpl/t/rpl_heartbeat_log_event_underflow.test
>   share/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
>   share/mysql-test/suite/rpl/t/rpl_hrtime.test
>   share/mysql-test/suite/rpl/t/rpl_hrtime_row.test
> @@ -16328,14 +16450,18 @@ share/mysql-test/suite/rpl/t/rpl_perfsch
>   share/mysql-test/suite/rpl/t/rpl_plugin_load.test
>   share/mysql-test/suite/rpl/t/rpl_ps.test
>   share/mysql-test/suite/rpl/t/rpl_query_cache.test
> +share/mysql-test/suite/rpl/t/rpl_queue_event_length_mismatch-master.opt
> +share/mysql-test/suite/rpl/t/rpl_queue_event_length_mismatch.test
>   share/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
> -share/mysql-test/suite/rpl/t/rpl_read_new_relay_log_info.test
>   share/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test
>   share/mysql-test/suite/rpl/t/rpl_read_only.test
>   share/mysql-test/suite/rpl/t/rpl_read_only2.test
>   share/mysql-test/suite/rpl/t/rpl_relay_max_extension.test
>   share/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
>   share/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
> +share/mysql-test/suite/rpl/t/rpl_relaylog_corruption-slave.opt
> +share/mysql-test/suite/rpl/t/rpl_relaylog_corruption.combinations
> +share/mysql-test/suite/rpl/t/rpl_relaylog_corruption.test
>   share/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
>   share/mysql-test/suite/rpl/t/rpl_relayrotate.test
>   share/mysql-test/suite/rpl/t/rpl_relayspace-slave.opt
> @@ -16361,6 +16487,8 @@ share/mysql-test/suite/rpl/t/rpl_rewrite
>   share/mysql-test/suite/rpl/t/rpl_rewrite_db_sys_vars.test
>   share/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
>   share/mysql-test/suite/rpl/t/rpl_rewrt_db.test
> +share/mysql-test/suite/rpl/t/rpl_rotate_ev_overflow.test
> +share/mysql-test/suite/rpl/t/rpl_rotate_log_event_overflow.test
>   share/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
>   share/mysql-test/suite/rpl/t/rpl_rotate_logs.test
>   share/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt
> @@ -16650,6 +16778,10 @@ share/mysql-test/suite/rpl/t/rpl_sync-sl
>   share/mysql-test/suite/rpl/t/rpl_sync.test
>   share/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.cnf
>   share/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.test
> +share/mysql-test/suite/rpl/t/rpl_table_map_log_event_overflow.test
> +share/mysql-test/suite/rpl/t/rpl_table_map_metadata_underflow.test
> +share/mysql-test/suite/rpl/t/rpl_table_map_name_overflow-master.opt
> +share/mysql-test/suite/rpl/t/rpl_table_map_name_overflow.test
>   share/mysql-test/suite/rpl/t/rpl_table_options.test
>   share/mysql-test/suite/rpl/t/rpl_temp_table.test
>   share/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.opt
> @@ -16695,6 +16827,7 @@ share/mysql-test/suite/rpl/t/rpl_user_va
>   share/mysql-test/suite/rpl/t/rpl_using_gtid_default.test
>   share/mysql-test/suite/rpl/t/rpl_variables.test
>   share/mysql-test/suite/rpl/t/rpl_variables_stm.test
> +share/mysql-test/suite/rpl/t/rpl_vcol_row.test
>   share/mysql-test/suite/rpl/t/rpl_view.test
>   share/mysql-test/suite/rpl/t/rpl_view_debug.test
>   share/mysql-test/suite/rpl/t/rpl_view_multi.test
> @@ -17765,6 +17898,7 @@ share/mysql-test/suite/sys_vars/r/rpl_se
>   share/mysql-test/suite/sys_vars/r/secure_auth_basic.result
>   share/mysql-test/suite/sys_vars/r/secure_auth_func.result
>   share/mysql-test/suite/sys_vars/r/secure_auth_grant.result
> +share/mysql-test/suite/sys_vars/r/secure_file_priv,win.rdiff
>   share/mysql-test/suite/sys_vars/r/secure_file_priv.result
>   share/mysql-test/suite/sys_vars/r/secure_file_priv2.result
>   share/mysql-test/suite/sys_vars/r/secure_file_priv_basic.result
> @@ -17775,6 +17909,7 @@ share/mysql-test/suite/sys_vars/r/secure
>   share/mysql-test/suite/sys_vars/r/server_id_basic.result
>   share/mysql-test/suite/sys_vars/r/server_id_grant.result
>   share/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result
> +share/mysql-test/suite/sys_vars/r/session_track_system_variables_example.result
>   share/mysql-test/suite/sys_vars/r/show_slave_auth_info_basic.result
>   share/mysql-test/suite/sys_vars/r/show_vs_valstr.result
>   share/mysql-test/suite/sys_vars/r/skip_external_locking_basic.result
> @@ -17870,6 +18005,7 @@ share/mysql-test/suite/sys_vars/r/sysvar
>   share/mysql-test/suite/sys_vars/r/sysvars_debug.result
>   share/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
>   share/mysql-test/suite/sys_vars/r/sysvars_innodb.result
> +share/mysql-test/suite/sys_vars/r/sysvars_readonly_debug.result
>   share/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
>   share/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
>   share/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
> @@ -18614,7 +18750,7 @@ share/mysql-test/suite/sys_vars/t/secure
>   share/mysql-test/suite/sys_vars/t/secure_auth_func-master.opt
>   share/mysql-test/suite/sys_vars/t/secure_auth_func.test
>   share/mysql-test/suite/sys_vars/t/secure_auth_grant.test
> -share/mysql-test/suite/sys_vars/t/secure_file_priv-master.opt
> +share/mysql-test/suite/sys_vars/t/secure_file_priv.opt
>   share/mysql-test/suite/sys_vars/t/secure_file_priv.test
>   share/mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt
>   share/mysql-test/suite/sys_vars/t/secure_file_priv2.test
> @@ -18630,6 +18766,7 @@ share/mysql-test/suite/sys_vars/t/secure
>   share/mysql-test/suite/sys_vars/t/server_id_basic.test
>   share/mysql-test/suite/sys_vars/t/server_id_grant.test
>   share/mysql-test/suite/sys_vars/t/session_track_system_variables_basic.test
> +share/mysql-test/suite/sys_vars/t/session_track_system_variables_example.test
>   share/mysql-test/suite/sys_vars/t/show_slave_auth_info_basic.opt
>   share/mysql-test/suite/sys_vars/t/show_slave_auth_info_basic.test
>   share/mysql-test/suite/sys_vars/t/show_vs_valstr.test
> @@ -18730,6 +18867,8 @@ share/mysql-test/suite/sys_vars/t/sysvar
>   share/mysql-test/suite/sys_vars/t/sysvars_debug.test
>   share/mysql-test/suite/sys_vars/t/sysvars_innodb.opt
>   share/mysql-test/suite/sys_vars/t/sysvars_innodb.test
> +share/mysql-test/suite/sys_vars/t/sysvars_readonly_debug.opt
> +share/mysql-test/suite/sys_vars/t/sysvars_readonly_debug.test
>   share/mysql-test/suite/sys_vars/t/sysvars_server_embedded.test
>   share/mysql-test/suite/sys_vars/t/sysvars_server_notembedded.test
>   share/mysql-test/suite/sys_vars/t/sysvars_star.cnf
> @@ -19292,6 +19431,7 @@ share/mysql-test/suite/wsrep/r/variables
>   share/mysql-test/suite/wsrep/r/variables_debug.result
>   share/mysql-test/suite/wsrep/r/wsrep-recover-gtid-nobinlog.result
>   share/mysql-test/suite/wsrep/r/wsrep-recover-gtid.result
> +share/mysql-test/suite/wsrep/r/wsrep-recover-sequences.result
>   share/mysql-test/suite/wsrep/r/wsrep-recover-v25,binlogon.rdiff
>   share/mysql-test/suite/wsrep/r/wsrep-recover-v25.result
>   share/mysql-test/suite/wsrep/r/wsrep-recover.result
> @@ -19346,6 +19486,9 @@ share/mysql-test/suite/wsrep/t/wsrep-rec
>   share/mysql-test/suite/wsrep/t/wsrep-recover-gtid-nobinlog.test
>   share/mysql-test/suite/wsrep/t/wsrep-recover-gtid.cnf
>   share/mysql-test/suite/wsrep/t/wsrep-recover-gtid.test
> +share/mysql-test/suite/wsrep/t/wsrep-recover-sequences.cnf
> +share/mysql-test/suite/wsrep/t/wsrep-recover-sequences.combinations
> +share/mysql-test/suite/wsrep/t/wsrep-recover-sequences.test
>   share/mysql-test/suite/wsrep/t/wsrep-recover-step.inc
>   share/mysql-test/suite/wsrep/t/wsrep-recover-v25.cnf
>   share/mysql-test/suite/wsrep/t/wsrep-recover-v25.combinations