CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Oct 30 12:53:55 UTC 2022

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

Log Message:
mysql57: updated to 5.7.40

Changes in MySQL 5.7.40

Functionality Added or Changed

Important Change: The linked OpenSSL library for MySQL Server has been updated to version 1.1.1q. Issues fixed in OpenSSL version 1.1.1q are described at https://www.openssl.org/news/cl111.txt and 
https://www.openssl.org/news/vulnerabilities.html.

The linked curl library for MySQL Server (Enterprise Edition) has been updated to version 7.84.0.

MySQL Server’s AES_ENCRYPT() and AES_DECRYPT() functions now support the use of a key derivation function (KDF) to create a cryptographically strong secret key from information such as a password or 
a passphrase that you pass to the function. The derived key is used to encrypt and decrypt the data, and it remains in the MySQL Server instance and is not accessible to users. Using a KDF is highly 
recommended, as it provides better security than specifying your own premade key or deriving it by a simpler method when you use the function. The functions support HKDF (available from OpenSSL 
1.1.0), for which you can specify an optional salt and context-specific information to include in the keying material, and PBKDF2 (available from OpenSSL 1.0.2), for which you can specify an optional 
salt and set the number of iterations used to produce the key.

Bugs Fixed

InnoDB: In debug builds, a descending b-tree scan raised a debug assertion failure.

InnoDB: An index latch order violation in dict_table_x_lock_indexes() caused an assertion failure.

InnoDB: A TRUNCATE TABLE operation failed to free an acquired mutex in specific cases.

The server did not always process nested views as expected.

mysqlpump might not be given the correct permissions to use derived tables (tables that are generated by a query FROM clause), causing the dump process to stop if these were present. Derived tables 
are now handled separately and privileges are set for them.

When using --log-timestamps=SYSTEM, ISO 8601 timestamps in log messages did not take account of daylight saving time.

The GRANT OPTION privilege was treated as related to database operations.

Changes in MySQL 5.7.39

Compilation Notes

Added macOS/ARM support.

On Windows, improved the generated INFO_BIN and INFO_SRC files.

Keyring Notes

The keyring_aws plugin has been updated to use the latest AWS Encryption SDK for C (version 1.9.186).

The keyring_aws_region variable supports the additional AWS regions supported by the new SDK. Refer to the variable description for a list of supported AWS regions.

Performance Schema Notes

The SHOW PROCESSLIST statement provides process information by collecting thread data from all active threads. However, because the implementation iterates across active threads from within the 
thread manager while holding a global mutex, it has negative performance consequences, particularly on busy systems.

An alternative SHOW PROCESSLIST implementation is now available based on the new Performance Schema processlist table. This implementation queries active thread data from the Performance Schema 
rather than the thread manager and does not require a mutex:

To enable the alternative implementation, enable the performance_schema_show_processlist system variable.

Note
The processlist table is automatically created in the Performance Schema for new installations of MySQL 5.7.39, or higher, and upgrades to MySQL 5.7.39, or higher.

The alternative implementation of SHOW PROCESSLIST also applies to the mysqladmin processlist command.

The alternative implementation does not apply to the INFORMATION_SCHEMA PROCESSLIST table or the COM_PROCESS_INFO command of the MySQL client/server protocol.

To ensure that the default and alternative implementations yield the same information, certain configuration requirements must be met; see The processlist Table.

Functionality Added or Changed

Important Change: The linked curl library for MySQL Server (Enterprise Edition) has been updated to version 7.83.1.

Important Change: The linked OpenSSL library for MySQL Server has been updated to version 1.1.1o. Issues fixed in OpenSSL version 1.1.1o are described at https://www.openssl.org/news/cl111.txt and 
https://www.openssl.org/news/vulnerabilities.html.

The myisam_repair_threads system variable and myisamchk --parallel-recover option were removed.

Bugs Fixed

InnoDB: A 4GB tablespace file size limit on Windows 32-bit systems has been removed. The limit was due to an incorrect calculation performed while extending the tablespace.

Replication: The write sets extracted by MySQL Replication from transactions when the transaction_write_set_extraction system variable is enabled (which is the default) are extracted from primary 
keys, unique keys, and foreign keys. They are used to detect dependencies and conflicts between transactions. Previously, write sets involving multi-column foreign keys were incorrectly identifying 
each column as a separate foreign key. The issue has now been fixed and foreign key write sets include all referenced key columns.

Replication: When the --replicate-same-server-id option was used to make the replica not skip events that have its own server ID, if the log file was rotated, replication stopped with an error. The 
log rotation event now checks and applies the current value of the option.

Under certain circumstances TRUNCATE performance_schema.accounts caused duplicated counts in global_status.

This occurred only if the following was true:

If show_compatibility_56 is set to 0, aggregating status variables by accounts, users and hosts.

If some hosts were not instrumented. For example, if performance_schema_hosts_size was set to a low value.

Our thanks to Yuxiang Jiang and the Tencent team for the contribution.

Upgraded the bundled zlib library to zlib 1.2.12. Also made zlib 1.2.12 the minimum zlib version supported, and removed WITH_ZLIB from the WITH_SYSTEM_LIBS CMake option.

If an incorrect value was set for the binlog_checksum system variable during a session, a COM_BINLOG_DUMP command made in the same session to request a binary log stream from a source failed. The 
server now validates the specified checksum value before starting the checksum algorithm setup process.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/databases/mysql57-client/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/mysql57-client/PLIST
cvs rdiff -u -r1.49 -r1.50 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.44 -r1.45 pkgsrc/databases/mysql57-server/Makefile
cvs rdiff -u -r1.24 -r1.25 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.43 pkgsrc/databases/mysql57-client/Makefile:1.44
--- pkgsrc/databases/mysql57-client/Makefile:1.43       Tue Jun 28 11:31:18 2022
+++ pkgsrc/databases/mysql57-client/Makefile    Sun Oct 30 12:53:55 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2022/06/28 11:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2022/10/30 12:53:55 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.38 pkgsrc/databases/mysql57-client/Makefile.common:1.39
--- pkgsrc/databases/mysql57-client/Makefile.common:1.38        Thu Apr 28 13:19:04 2022
+++ pkgsrc/databases/mysql57-client/Makefile.common     Sun Oct 30 12:53:55 2022
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.common,v 1.38 2022/04/28 13:19:04 adam Exp $
+# $NetBSD: Makefile.common,v 1.39 2022/10/30 12:53:55 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.38
+DISTNAME=      mysql-5.7.40
 CATEGORIES=    databases
-MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.7/}
+#MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
+MASTER_SITES=  https://dev.mysql.com/get/Downloads/MySQL-5.7/
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.mysql.com/

Index: pkgsrc/databases/mysql57-client/PLIST
diff -u pkgsrc/databases/mysql57-client/PLIST:1.25 pkgsrc/databases/mysql57-client/PLIST:1.26
--- pkgsrc/databases/mysql57-client/PLIST:1.25  Thu Apr 28 13:19:04 2022
+++ pkgsrc/databases/mysql57-client/PLIST       Sun Oct 30 12:53:55 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2022/04/28 13:19:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2022/10/30 12:53:55 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.25
+lib/libmysqlclient.so.20.3.27
 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.49 pkgsrc/databases/mysql57-client/distinfo:1.50
--- pkgsrc/databases/mysql57-client/distinfo:1.49       Thu Apr 28 13:19:04 2022
+++ pkgsrc/databases/mysql57-client/distinfo    Sun Oct 30 12:53:55 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.49 2022/04/28 13:19:04 adam Exp $
+$NetBSD: distinfo,v 1.50 2022/10/30 12:53:55 adam Exp $
 
-BLAKE2s (mysql-5.7.38.tar.gz) = 4e3a03502455685971333d26608680590ba5b7f1957b2f1dbc899b5041d9d778
-SHA512 (mysql-5.7.38.tar.gz) = 1f861c6edd81a89aff6a4e8116bf78a1df11c3fa6bedbf99dbd827ae1e4dbae5b3625f825b00410c731dd298d1563feb922fd65d8c48036ba46e0d8dffb80f81
-Size (mysql-5.7.38.tar.gz) = 56247722 bytes
+BLAKE2s (mysql-5.7.40.tar.gz) = bef0a0126f3ab1c9c25818b7ea43d6fe4414a764aed1e48efffba753a0253441
+SHA512 (mysql-5.7.40.tar.gz) = 5504ff4135f604000f7c3a4d3402d223021069311d905ae7d8e82c286281ebe07b5b5d384f50f2cd590501fe35b58c71782caa81512d54bab09332f727233923
+Size (mysql-5.7.40.tar.gz) = 56523688 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb

Index: pkgsrc/databases/mysql57-server/Makefile
diff -u pkgsrc/databases/mysql57-server/Makefile:1.44 pkgsrc/databases/mysql57-server/Makefile:1.45
--- pkgsrc/databases/mysql57-server/Makefile:1.44       Tue Jun 28 11:31:18 2022
+++ pkgsrc/databases/mysql57-server/Makefile    Sun Oct 30 12:53:55 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2022/06/28 11:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2022/10/30 12:53:55 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.24 pkgsrc/databases/mysql57-server/PLIST:1.25
--- pkgsrc/databases/mysql57-server/PLIST:1.24  Thu Apr 28 13:19:04 2022
+++ pkgsrc/databases/mysql57-server/PLIST       Sun Oct 30 12:53:55 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2022/04/28 13:19:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2022/10/30 12:53:55 adam Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -610,6 +610,7 @@ share/mysql/test/include/have_numa.inc
 share/mysql/test/include/have_openssl.inc
 share/mysql/test/include/have_openssl_binary.inc
 share/mysql/test/include/have_openssl_support.inc
+share/mysql/test/include/have_openssl_version_1.1.0.inc
 share/mysql/test/include/have_optimizer_trace.inc
 share/mysql/test/include/have_outfile.inc
 share/mysql/test/include/have_partition.inc
@@ -1256,6 +1257,8 @@ share/mysql/test/r/func_aes.result
 share/mysql/test/r/func_aes_cfb1.result
 share/mysql/test/r/func_aes_cfb128.result
 share/mysql/test/r/func_aes_cfb8.result
+share/mysql/test/r/func_aes_kdf_hkdf.result
+share/mysql/test/r/func_aes_kdf_pbkdf2_hmac.result
 share/mysql/test/r/func_aes_misc.result
 share/mysql/test/r/func_aes_ofb.result
 share/mysql/test/r/func_analyse.result
@@ -2239,6 +2242,9 @@ share/mysql/test/std_data/parts/t1_will_
 share/mysql/test/std_data/parts/t1_will_crash#P#p6_3.MYD
 share/mysql/test/std_data/parts/t575.frm
 share/mysql/test/std_data/parts/t575.par
+share/mysql/test/std_data/replicated-bin.000001
+share/mysql/test/std_data/replicated-bin.000002
+share/mysql/test/std_data/replicated-bin.index
 share/mysql/test/std_data/rpl_bug28618.dat
 share/mysql/test/std_data/rpl_loaddata.dat
 share/mysql/test/std_data/rpl_loaddata2.dat
@@ -5217,6 +5223,7 @@ share/mysql/test/suite/innodb/r/i_s_file
 share/mysql/test/suite/innodb/r/ibuf_not_empty.result
 share/mysql/test/suite/innodb/r/import.result
 share/mysql/test/suite/innodb/r/import_compress_encrypt.result
+share/mysql/test/suite/innodb/r/import_compress_encrypt_upgrade.result
 share/mysql/test/suite/innodb/r/import_export_4k.result
 share/mysql/test/suite/innodb/r/import_tablespace_page_corrupt.result
 share/mysql/test/suite/innodb/r/import_tablespace_schema_missmatch.result
@@ -5597,6 +5604,7 @@ share/mysql/test/suite/innodb/t/ibuf_not
 share/mysql/test/suite/innodb/t/ibuf_not_empty.test
 share/mysql/test/suite/innodb/t/import.test
 share/mysql/test/suite/innodb/t/import_compress_encrypt.test
+share/mysql/test/suite/innodb/t/import_compress_encrypt_upgrade.test
 share/mysql/test/suite/innodb/t/import_export_4k.test
 share/mysql/test/suite/innodb/t/import_tablespace_page_corrupt.test
 share/mysql/test/suite/innodb/t/import_tablespace_schema_missmatch.test
@@ -8450,6 +8458,8 @@ share/mysql/test/suite/perfschema/includ
 share/mysql/test/suite/perfschema/include/prepared_stmts_execution.inc
 share/mysql/test/suite/perfschema/include/prepared_stmts_setup.inc
 share/mysql/test/suite/perfschema/include/privilege.inc
+share/mysql/test/suite/perfschema/include/processlist_load.inc
+share/mysql/test/suite/perfschema/include/processlist_set.inc
 share/mysql/test/suite/perfschema/include/program_cleanup.inc
 share/mysql/test/suite/perfschema/include/program_execution.inc
 share/mysql/test/suite/perfschema/include/program_nested_cleanup.inc
@@ -8561,6 +8571,7 @@ share/mysql/test/suite/perfschema/r/ddl_
 share/mysql/test/suite/perfschema/r/ddl_os_global_by_type.result
 share/mysql/test/suite/perfschema/r/ddl_performance_timers.result
 share/mysql/test/suite/perfschema/r/ddl_prepared_statements_instances.result
+share/mysql/test/suite/perfschema/r/ddl_processlist.result
 share/mysql/test/suite/perfschema/r/ddl_replication_applier_configuration.result
 share/mysql/test/suite/perfschema/r/ddl_replication_applier_status.result
 share/mysql/test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result
@@ -8652,6 +8663,7 @@ share/mysql/test/suite/perfschema/r/dml_
 share/mysql/test/suite/perfschema/r/dml_os_global_by_type.result
 share/mysql/test/suite/perfschema/r/dml_performance_timers.result
 share/mysql/test/suite/perfschema/r/dml_prepared_statements_instances.result
+share/mysql/test/suite/perfschema/r/dml_processlist.result
 share/mysql/test/suite/perfschema/r/dml_replication_applier_configuration.result
 share/mysql/test/suite/perfschema/r/dml_replication_applier_status.result
 share/mysql/test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
@@ -8752,6 +8764,7 @@ share/mysql/test/suite/perfschema/r/memo
 share/mysql/test/suite/perfschema/r/memory_table_io.result
 share/mysql/test/suite/perfschema/r/merge_table_io.result
 share/mysql/test/suite/perfschema/r/misc.result
+share/mysql/test/suite/perfschema/r/misc_global_status.result
 share/mysql/test/suite/perfschema/r/multi_table_io.result
 share/mysql/test/suite/perfschema/r/myisam_file_io.result
 share/mysql/test/suite/perfschema/r/myisam_table_io.result
@@ -8769,6 +8782,13 @@ share/mysql/test/suite/perfschema/r/prep
 share/mysql/test/suite/perfschema/r/prepared_stmts_by_stored_programs.result
 share/mysql/test/suite/perfschema/r/privilege.result
 share/mysql/test/suite/perfschema/r/privilege_table_io.result
+share/mysql/test/suite/perfschema/r/processlist.result
+share/mysql/test/suite/perfschema/r/processlist_57.result
+share/mysql/test/suite/perfschema/r/processlist_acl.result
+share/mysql/test/suite/perfschema/r/processlist_anonymous.result
+share/mysql/test/suite/perfschema/r/processlist_no_pfs.result
+share/mysql/test/suite/perfschema/r/processlist_port.result
+share/mysql/test/suite/perfschema/r/processlist_reg_user.result
 share/mysql/test/suite/perfschema/r/query_cache.result
 share/mysql/test/suite/perfschema/r/read_only.result
 share/mysql/test/suite/perfschema/r/relaylog.result
@@ -9009,6 +9029,7 @@ share/mysql/test/suite/perfschema/t/ddl_
 share/mysql/test/suite/perfschema/t/ddl_os_global_by_type.test
 share/mysql/test/suite/perfschema/t/ddl_performance_timers.test
 share/mysql/test/suite/perfschema/t/ddl_prepared_statements_instances.test
+share/mysql/test/suite/perfschema/t/ddl_processlist.test
 share/mysql/test/suite/perfschema/t/ddl_replication_applier_configuration.test
 share/mysql/test/suite/perfschema/t/ddl_replication_applier_status.test
 share/mysql/test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test
@@ -9102,6 +9123,7 @@ share/mysql/test/suite/perfschema/t/dml_
 share/mysql/test/suite/perfschema/t/dml_os_global_by_type.test
 share/mysql/test/suite/perfschema/t/dml_performance_timers.test
 share/mysql/test/suite/perfschema/t/dml_prepared_statements_instances.test
+share/mysql/test/suite/perfschema/t/dml_processlist.test
 share/mysql/test/suite/perfschema/t/dml_replication_applier_configuration.test
 share/mysql/test/suite/perfschema/t/dml_replication_applier_status.test
 share/mysql/test/suite/perfschema/t/dml_replication_applier_status_by_coordinator.test
@@ -9242,6 +9264,8 @@ share/mysql/test/suite/perfschema/t/memo
 share/mysql/test/suite/perfschema/t/memory_table_io.test
 share/mysql/test/suite/perfschema/t/merge_table_io.test
 share/mysql/test/suite/perfschema/t/misc.test
+share/mysql/test/suite/perfschema/t/misc_global_status-master.opt
+share/mysql/test/suite/perfschema/t/misc_global_status.test
 share/mysql/test/suite/perfschema/t/multi_table_io.test
 share/mysql/test/suite/perfschema/t/myisam_file_io.opt
 share/mysql/test/suite/perfschema/t/myisam_file_io.test
@@ -9267,6 +9291,17 @@ share/mysql/test/suite/perfschema/t/prep
 share/mysql/test/suite/perfschema/t/prepared_stmts_by_stored_programs.test
 share/mysql/test/suite/perfschema/t/privilege.test
 share/mysql/test/suite/perfschema/t/privilege_table_io.test
+share/mysql/test/suite/perfschema/t/processlist-master.opt
+share/mysql/test/suite/perfschema/t/processlist.test
+share/mysql/test/suite/perfschema/t/processlist_57.test
+share/mysql/test/suite/perfschema/t/processlist_acl-master.opt
+share/mysql/test/suite/perfschema/t/processlist_acl.test
+share/mysql/test/suite/perfschema/t/processlist_anonymous.test
+share/mysql/test/suite/perfschema/t/processlist_no_pfs-master.opt
+share/mysql/test/suite/perfschema/t/processlist_no_pfs.test
+share/mysql/test/suite/perfschema/t/processlist_port-master.opt
+share/mysql/test/suite/perfschema/t/processlist_port.test
+share/mysql/test/suite/perfschema/t/processlist_reg_user.test
 share/mysql/test/suite/perfschema/t/query_cache-master.opt
 share/mysql/test/suite/perfschema/t/query_cache.test
 share/mysql/test/suite/perfschema/t/read_only.test
@@ -9646,6 +9681,7 @@ share/mysql/test/suite/rpl/r/rpl_alter_r
 share/mysql/test/suite/rpl/r/rpl_alter_user.result
 share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result
 share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result
+share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_same_server_id.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment_11932.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment_bug33029.result
@@ -10321,6 +10357,7 @@ share/mysql/test/suite/rpl/t/rpl_alter_r
 share/mysql/test/suite/rpl/t/rpl_alter_user.test
 share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
 share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
+share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_same_server_id.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment-master.opt
 share/mysql/test/suite/rpl/t/rpl_auto_increment.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment_11932.test
@@ -11854,8 +11891,6 @@ share/mysql/test/suite/sys_vars/r/myisam
 share/mysql/test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
 share/mysql/test/suite/sys_vars/r/myisam_mmap_size_basic.result
 share/mysql/test/suite/sys_vars/r/myisam_recover_options_basic.result
-share/mysql/test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
-share/mysql/test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
 share/mysql/test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
 share/mysql/test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
 share/mysql/test/suite/sys_vars/r/myisam_stats_method_basic.result
@@ -11934,6 +11969,7 @@ share/mysql/test/suite/sys_vars/r/pfs_ma
 share/mysql/test/suite/sys_vars/r/pfs_session_connect_attrs_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_setup_actors_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_setup_objects_size_basic.result
+share/mysql/test/suite/sys_vars/r/pfs_show_processlist_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_users_size_basic.result
 share/mysql/test/suite/sys_vars/r/pid_file_basic.result
 share/mysql/test/suite/sys_vars/r/plugin_dir_basic.result
@@ -12563,8 +12599,6 @@ share/mysql/test/suite/sys_vars/t/myisam
 share/mysql/test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
 share/mysql/test/suite/sys_vars/t/myisam_mmap_size_basic.test
 share/mysql/test/suite/sys_vars/t/myisam_recover_options_basic.test
-share/mysql/test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
-share/mysql/test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
 share/mysql/test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
 share/mysql/test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
 share/mysql/test/suite/sys_vars/t/myisam_stats_method_basic.test
@@ -12691,6 +12725,7 @@ share/mysql/test/suite/sys_vars/t/pfs_se
 share/mysql/test/suite/sys_vars/t/pfs_setup_actors_size_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_setup_objects_size_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_setup_objects_size_basic.test
+share/mysql/test/suite/sys_vars/t/pfs_show_processlist_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_users_size_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_users_size_basic.test
 share/mysql/test/suite/sys_vars/t/pid_file_basic.test
@@ -13823,6 +13858,8 @@ share/mysql/test/t/func_aes.test
 share/mysql/test/t/func_aes_cfb1.test
 share/mysql/test/t/func_aes_cfb128.test
 share/mysql/test/t/func_aes_cfb8.test
+share/mysql/test/t/func_aes_kdf_hkdf.test
+share/mysql/test/t/func_aes_kdf_pbkdf2_hmac.test
 share/mysql/test/t/func_aes_misc.test
 share/mysql/test/t/func_aes_ofb.test
 share/mysql/test/t/func_analyse.test