mysql57: updated to 5.7.24

Changes in MySQL 5.7.24

Deprecation and Removal Notes

* InnoDB; Partitioning: Support for placing table partitions in shared tablespaces is deprecated and will be removed in a future version of MySQL. Shared tablespaces include the system tablespace and general tablespaces. For information about identifying partitions in shared tablespaces and moving them to file-per-table tablespaces, see Preparing Your Installation for Upgrade.

* InnoDB: Support for TABLESPACE = innodb_file_per_table and TABLESPACE = innodb_temporary clauses with CREATE TEMPORARY TABLE is deprecated and will be removed in a future MySQL version.


Functionality Added or Changed

Replication: Use the group_replication_exit_state_action option to configure how Group Replication behaves when a member leaves the group involuntarily, for example when it is expelled from the group due to an unstable network connection. When group_replication_exit_state_action is set to ABORT_SERVER, upon exiting the group unintentionally, the instance shuts MySQL down, and when group_replication_exit_state_action is set to READ_ONLY the instance sets MySQL to super read only mode instead and its state is set to ERROR.

Previously, file I/O performed in the I/O cache in the mysys library was not instrumented, affecting in particular file I/O statistics reported by the Performance Schema about the binary log index file. Now, this I/O is instrumented and Performance Schema statistics are accurate. Thanks to Yura Sorokin for the contribution.

The zlib library version bundled with MySQL was raised from version 1.2.3 to version 1.2.11. MySQL implements compression with the help of the zlib library.

The zlib compressBound() function in zlib 1.2.11 returns a slightly higher estimate of the buffer size required to compress a given length of bytes than it did in zlib version 1.2.3. The compressBound() function is called by InnoDB functions that determine the maximum row size permitted when creating compressed InnoDB tables or inserting rows into compressed InnoDB tables. As a result, CREATE TABLE ... ROW_FORMAT=COMPRESSED or INSERT operations with row sizes very close to the maximum row size that were successful in earlier releases could now fail.

Bugs Fixed

* InnoDB: An ALTER TABLE operation that added a primary key produced a segmentation fault.

* InnoDB: A query that scanned the primary key of a table did not return the expected result.

* InnoDB: A query interruption during a lock wait caused an error.

* InnoDB: An index record was not found when updating a secondary index defined on a generated column.

* InnoDB: The update log applied as part of an online ALTER TABLE operation did not take into account the computed value of the generated column in the old row while updating the secondary index.

* InnoDB: An unsupported DDL operation involving a foreign key constraint raised an assertion.

* InnoDB: An attempted foreign key check on a discarded table caused a segmentation fault.

* InnoDB: An assertion was raised during an OPTIMIZE TABLE operation.

* InnoDB: A foreign key constraint name was duplicated during a rename table operation, causing a failure during later query execution.

* InnoDB: In a function called before the execution of a statement in a stored procedure, a read and write operation on trx->lock.start_stmt was not protected by a mutex.

* InnoDB: An error occurred during a DDL operation due to a mismatch in a REDUNDANT row format calculation that determines the length of the online log.

* InnoDB: The location of the Innodb Merge Temp File that reported by the wait/io/file/innodb/innodb_temp_file Performance Schema instrument was incorrect.

* Partitioning: When a CREATE TABLE ... PARTITION BY ... statement failed due to an invalid partition definition, the server did not remove any partition files which might have been created prior to encountering the invalid PARTITION clause.

* Partitioning: It was possible to perform FLUSH TABLES FOR EXPORT on a partitioned table created with innodb_file_per_table=1 after discarding its tablespace. Attempting to do so now raises ER_TABLESPACE_DISCARDED.

* Replication: When the binlog_group_commit_sync_delay system variable is set to a wait time to delay synchronization of transactions to disk, and the binlog_group_commit_sync_no_delay_count system variable is also set to a number of transactions, the MySQL server exits the wait procedure if the specified number of transactions is reached before the specified wait time is reached. The server manages this process by checking on the transaction count after a delta of one tenth of the time specified by binlog_group_commit_sync_delay has elapsed, then subtracting that interval from the remaining wait time.

more...

8 files changed, 108 insertions, 27 deletions

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 82c1ae51e79..5b71d2cf55d 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2018/09/07 20:40:45 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/11/22 16:14:53 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	2
 COMMENT=	MySQL 5, a free SQL database (client)
 
 CONFLICTS=	mysql3-client-[0-9]*
diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common
index 6187f852345..e3af1bee363 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2018/08/16 16:06:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/11/22 16:14:53 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=	mysql-5.7.23
+DISTNAME=	mysql-5.7.24
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index e451904c368..b48c6204c1c 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2018/09/07 20:40:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/11/22 16:14:53 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.10
+lib/libmysqlclient.so.20.3.11
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index cf8fd7061db..3f2c2cc3c33 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2018/11/13 11:24:38 markd Exp $
+$NetBSD: distinfo,v 1.25 2018/11/22 16:14:53 adam Exp $
 
-SHA1 (mysql-5.7.23.tar.gz) = 0c07dd1670f3749c482180227717738c031bb5b4
-RMD160 (mysql-5.7.23.tar.gz) = 20021aa73537f4630b72931925bec78c251b06e6
-SHA512 (mysql-5.7.23.tar.gz) = 4c303ef03cd808f96a6548ef3ff5107d2fa41dc3776b42513d482cec539ffac33a5a412749de5d9c60b2a8f3e4f592bfef5a4a79d741013de13621c2ce5122a0
-Size (mysql-5.7.23.tar.gz) = 51907462 bytes
+SHA1 (mysql-5.7.24.tar.gz) = e2f73a243659075d0100a71b8338c752c0c65de8
+RMD160 (mysql-5.7.24.tar.gz) = 67fc0207cb6fae76af0b6e18bb1f6e14d190ac4c
+SHA512 (mysql-5.7.24.tar.gz) = c3a00788b91c243696cf140d2e3a374c3154ace97413ba09bc85c2d4325ec7bf476cd7eb5bff5c33e0407fc345f12b73d4cce19894c0f8ab9e1853f6a6cfa351
+Size (mysql-5.7.24.tar.gz) = 52052796 bytes
 SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
 SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
@@ -23,17 +23,18 @@ SHA1 (patch-libmysql_CMakeLists.txt) = 306c73384226e07bf2a45af5d92b6f05d6044cbe
 SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
 SHA1 (patch-mysys__ssl_CMakeLists.txt) = 4750125b2e98d11c9efb653beda2d4d5166adc02
 SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
+SHA1 (patch-mysys_mf__iocache2.c) = 0c5047cbd4b9fc09d9e5b18bcae324d794fe833d
 SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2
 SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c) = 1a389fca13ada1be74d96276e11baee16bbc2363
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = 7077900830f904c74c79439b856d9d176fc27f15
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = d7f87bff5a41ff6a130fcf74dc520b38cedf5924
 SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = ff0679ed644d79abe52b208f6b60b5a4e480ed3f
-SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = aedf7d93889d4e7b4e04d182fe1a6775134f97e8
+SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 4f548abab6917c2bedd970abdffe4e87c460667e
 SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = c0ae4570e138869a3203f7d4704a0b6b5c19e517
 SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
-SHA1 (patch-sql_CMakeLists.txt) = d66fe5fc8ac3a6230f1a3aa1395cf72e1a2b682e
+SHA1 (patch-sql_CMakeLists.txt) = 697add15adb66bf55cf561a6e43e0bf514d1e068
 SHA1 (patch-sql_conn__handler_socket__connection.cc) = 12cf83e061edbe59eb073037b1036903b7ba4b00
 SHA1 (patch-sql_item__geofunc__internal.cc) = 752862c3a30231e694e508ced1a215a610649fc6
 SHA1 (patch-sql_log_event.h) = 311dc7fb04ea832df229dc2a28bcfbf263670ebf
diff --git a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
index 723b9e15536..0cd94250ee3 100644
--- a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
@@ -1,16 +1,15 @@
-$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.3 2018/04/29 21:44:12 adam Exp $
+$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.4 2018/11/22 16:14:53 adam Exp $
 
-Use system OpenSSL and zlib.
+Use system OpenSSL.
 Fix mysqlxtest binary linking.
 
---- rapid/plugin/x/CMakeLists.txt.orig	2018-03-04 13:40:40.000000000 +0000
+--- rapid/plugin/x/CMakeLists.txt.orig	2018-10-04 05:48:22.000000000 +0000
 +++ rapid/plugin/x/CMakeLists.txt
-@@ -92,14 +92,14 @@ ELSE()
+@@ -92,13 +92,13 @@ ELSE()
      ${CMAKE_SOURCE_DIR}/include #temporary
      ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
      ${CMAKE_CURRENT_BINARY_DIR}/generated
 -    ${SSL_INCLUDE_DIRS}
--    ${ZLIB_INCLUDE_DIR}
    )
  
    INCLUDE_DIRECTORIES(SYSTEM
@@ -18,11 +17,10 @@ Fix mysqlxtest binary linking.
      ${PROTOBUF_INCLUDE_DIRS}
      ${LIBEVENT_INCLUDE_DIR}
 +    ${SSL_INCLUDE_DIRS}
-+    ${ZLIB_INCLUDE_DIR}
    )
  
    IF(XPLUGIN_NO_LITE_PROTOBUF)
-@@ -215,7 +215,10 @@ ELSE()
+@@ -214,7 +214,10 @@ ELSE()
    ENDIF()
  
    TARGET_LINK_LIBRARIES(mysqlxtest mysys strings mysqlclient)
diff --git a/databases/mysql57-client/patches/patch-sql_CMakeLists.txt b/databases/mysql57-client/patches/patch-sql_CMakeLists.txt
index 4f2a4f4ff54..353540d6516 100644
--- a/databases/mysql57-client/patches/patch-sql_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-sql_CMakeLists.txt
@@ -1,9 +1,9 @@
-$NetBSD: patch-sql_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-sql_CMakeLists.txt,v 1.2 2018/11/22 16:14:53 adam Exp $
 
---- sql/CMakeLists.txt.orig	2016-07-12 11:55:26.000000000 +0000
+--- sql/CMakeLists.txt.orig	2018-10-04 05:48:22.000000000 +0000
 +++ sql/CMakeLists.txt
-@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
-   ${ZLIB_INCLUDE_DIR}
+@@ -23,6 +23,8 @@ INCLUDE_DIRECTORIES(
+   ${CMAKE_SOURCE_DIR}/regex 
    ${SSL_INCLUDE_DIRS}
    ${CMAKE_BINARY_DIR}/sql
 +  ${CMAKE_BINARY_DIR}/include
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 21d9b2461d3..d373d263790 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2018/08/22 09:43:12 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/11/22 16:14:53 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
@@ -77,6 +76,7 @@ SUBST_FILES.perlpath+=	scripts/mysqldumpslow.sh
 SUBST_SED.perlpath=	-e 's,@PERL_PATH@,${PERL5},g'
 
 INSTALLATION_DIRS+=	bin
+TEST_TARGET=		test
 
 .include "../../mk/compiler.mk"
 
diff --git a/databases/mysql57-server/PLIST b/databases/mysql57-server/PLIST
index 62edba61bcb..382f23ffd65 100644
--- a/databases/mysql57-server/PLIST
+++ b/databases/mysql57-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2018/08/16 16:06:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/11/22 16:14:53 adam Exp $
 @pkgdir lib/mysql/plugin/debug
 bin/innochecksum
 bin/lz4_decompress
@@ -302,6 +302,7 @@ share/mysql/test/extra/rpl_tests/rpl_parallel_load_innodb.test
 share/mysql/test/extra/rpl_tests/rpl_parallel_recovery_core.test
 share/mysql/test/extra/rpl_tests/rpl_partition.test
 share/mysql/test/extra/rpl_tests/rpl_perfschema_applier_xa_status.test
+share/mysql/test/extra/rpl_tests/rpl_perfschema_order_by.test
 share/mysql/test/extra/rpl_tests/rpl_record_compare.test
 share/mysql/test/extra/rpl_tests/rpl_relayrotate.test
 share/mysql/test/extra/rpl_tests/rpl_replication_observers_example_plugin_server_startup.inc
@@ -1883,6 +1884,7 @@ share/mysql/test/r/strict_autoinc_3heap.result
 share/mysql/test/r/subquery_all.result
 share/mysql/test/r/subquery_all_bka.result
 share/mysql/test/r/subquery_all_bka_nixbnl.result
+share/mysql/test/r/subquery_bugs.result
 share/mysql/test/r/subquery_mat.result
 share/mysql/test/r/subquery_mat_all.result
 share/mysql/test/r/subquery_mat_none.result
@@ -2058,6 +2060,7 @@ share/mysql/test/std_data/Index.xml
 share/mysql/test/std_data/Japan
 share/mysql/test/std_data/Moscow_leap
 share/mysql/test/std_data/bad_gis_data.dat
+share/mysql/test/std_data/binlog_56_gtid_reserved_word.000001
 share/mysql/test/std_data/binlog_no_fd_event.000001
 share/mysql/test/std_data/binlog_savepoint.000001
 share/mysql/test/std_data/binlog_transaction.000001
@@ -2426,6 +2429,7 @@ share/mysql/test/suite/binlog/r/binlog_group_commit_flush_crash.result
 share/mysql/test/suite/binlog/r/binlog_group_commit_gtid_order.result
 share/mysql/test/suite/binlog/r/binlog_group_commit_indefinite_wait.result
 share/mysql/test/suite/binlog/r/binlog_group_commit_sync_delay.result
+share/mysql/test/suite/binlog/r/binlog_group_commit_sync_delay_error.result
 share/mysql/test/suite/binlog/r/binlog_group_commit_sync_no_delay_count.result
 share/mysql/test/suite/binlog/r/binlog_gtid_automatic_using_rolled_back.result
 share/mysql/test/suite/binlog/r/binlog_gtid_cache.result
@@ -2448,6 +2452,7 @@ 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_rbr_only_flag.result
+share/mysql/test/suite/binlog/r/binlog_gtid_reset_consistency_violation_on_fail.result
 share/mysql/test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result
 share/mysql/test/suite/binlog/r/binlog_gtid_simple_recovery.result
 share/mysql/test/suite/binlog/r/binlog_gtid_state_update_deadlock.result
@@ -2616,6 +2621,7 @@ share/mysql/test/suite/binlog/t/binlog_group_commit_flush_crash.test
 share/mysql/test/suite/binlog/t/binlog_group_commit_gtid_order.test
 share/mysql/test/suite/binlog/t/binlog_group_commit_indefinite_wait.test
 share/mysql/test/suite/binlog/t/binlog_group_commit_sync_delay.test
+share/mysql/test/suite/binlog/t/binlog_group_commit_sync_delay_error.test
 share/mysql/test/suite/binlog/t/binlog_group_commit_sync_no_delay_count.test
 share/mysql/test/suite/binlog/t/binlog_gtid_automatic_using_rolled_back.test
 share/mysql/test/suite/binlog/t/binlog_gtid_cache-master.opt
@@ -2643,6 +2649,7 @@ 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_rbr_only_flag.test
+share/mysql/test/suite/binlog/t/binlog_gtid_reset_consistency_violation_on_fail.test
 share/mysql/test/suite/binlog/t/binlog_gtid_row_ctype_ucs.test
 share/mysql/test/suite/binlog/t/binlog_gtid_simple_recovery.test
 share/mysql/test/suite/binlog/t/binlog_gtid_state_update_deadlock.test
@@ -3656,6 +3663,8 @@ share/mysql/test/suite/federated/include/federated.inc
 share/mysql/test/suite/federated/include/federated_cleanup.inc
 share/mysql/test/suite/federated/include/have_federated_db.inc
 share/mysql/test/suite/federated/my.cnf
+share/mysql/test/suite/federated/r/percona_bug1739734.result
+share/mysql/test/suite/federated/t/percona_bug1739734.test
 share/mysql/test/suite/funcs_1/README.txt
 share/mysql/test/suite/funcs_1/bitdata/bitdata_master.test
 share/mysql/test/suite/funcs_1/cursors/cursors_master.test
@@ -4221,6 +4230,8 @@ share/mysql/test/suite/group_replication/r/gr_compatibility_rules_and_force_lowe
 share/mysql/test/suite/group_replication/r/gr_compound_statements.result
 share/mysql/test/suite/group_replication/r/gr_compression_options.result
 share/mysql/test/suite/group_replication/r/gr_concurrent_events_insert_with_select.result
+share/mysql/test/suite/group_replication/r/gr_concurrent_start_uninstall.result
+share/mysql/test/suite/group_replication/r/gr_concurrent_stop_select.result
 share/mysql/test/suite/group_replication/r/gr_concurrent_uninstall_start.result
 share/mysql/test/suite/group_replication/r/gr_concurrent_uninstall_stop.result
 share/mysql/test/suite/group_replication/r/gr_connect_during_delayed_start.result
@@ -4241,6 +4252,19 @@ share/mysql/test/suite/group_replication/r/gr_dependent_ddl_dml_same_server.resu
 share/mysql/test/suite/group_replication/r/gr_disjoint_gtids_join_option_deprecation.result
 share/mysql/test/suite/group_replication/r/gr_disregard_nonunique_key.result
 share/mysql/test/suite/group_replication/r/gr_executed_sets_compatibility.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_applier_error.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_join_lower_version.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_join_members_exceeded.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_join_transaction_mismatch.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_join_wrong_hash_algorithm.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_join_wrong_single_primary_mode.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_majority_loss.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_member_expel.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_recovery.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_recovery_stage0.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_on_start_gr_cmd.result
+share/mysql/test/suite/group_replication/r/gr_exit_state_action_option.result
 share/mysql/test/suite/group_replication/r/gr_filters.result
 share/mysql/test/suite/group_replication/r/gr_flow_control_options.result
 share/mysql/test/suite/group_replication/r/gr_flush_applier_channel.result
@@ -4356,6 +4380,7 @@ share/mysql/test/suite/group_replication/r/gr_recovery_donor_failover.result
 share/mysql/test/suite/group_replication/r/gr_recovery_donor_retry.result
 share/mysql/test/suite/group_replication/r/gr_recovery_double_view_update.result
 share/mysql/test/suite/group_replication/r/gr_recovery_fails_to_detect_thread_stop.result
+share/mysql/test/suite/group_replication/r/gr_recovery_lower_max_retry_count.result
 share/mysql/test/suite/group_replication/r/gr_recovery_no_donors.result
 share/mysql/test/suite/group_replication/r/gr_recovery_no_more_donors.result
 share/mysql/test/suite/group_replication/r/gr_recovery_purged_donor_failover.result
@@ -4461,6 +4486,7 @@ share/mysql/test/suite/group_replication/r/gr_start_stop_parallel_applier_databa
 share/mysql/test/suite/group_replication/r/gr_start_stop_recovery.result
 share/mysql/test/suite/group_replication/r/gr_start_stop_slave_channel.result
 share/mysql/test/suite/group_replication/r/gr_start_stop_stress.result
+share/mysql/test/suite/group_replication/r/gr_startup_check_node_seed_skips_own_address.result
 share/mysql/test/suite/group_replication/r/gr_startup_verifications.result
 share/mysql/test/suite/group_replication/r/gr_startup_verifications_not_binlog.result
 share/mysql/test/suite/group_replication/r/gr_startup_verifications_not_gtid.result
@@ -4513,6 +4539,7 @@ share/mysql/test/suite/group_replication/t/gr_addmember_insert_on_donor.test
 share/mysql/test/suite/group_replication/t/gr_addmember_insert_on_nondonor.cnf
 share/mysql/test/suite/group_replication/t/gr_addmember_insert_on_nondonor.test
 share/mysql/test/suite/group_replication/t/gr_applier_early_failure.test
+share/mysql/test/suite/group_replication/t/gr_applier_error-slave.opt
 share/mysql/test/suite/group_replication/t/gr_applier_error.test
 share/mysql/test/suite/group_replication/t/gr_applier_initialization.test
 share/mysql/test/suite/group_replication/t/gr_applier_received_set.test
@@ -4558,6 +4585,8 @@ share/mysql/test/suite/group_replication/t/gr_compression_options-slave.opt
 share/mysql/test/suite/group_replication/t/gr_compression_options.test
 share/mysql/test/suite/group_replication/t/gr_concurrent_events_insert_with_select.cnf
 share/mysql/test/suite/group_replication/t/gr_concurrent_events_insert_with_select.test
+share/mysql/test/suite/group_replication/t/gr_concurrent_start_uninstall.test
+share/mysql/test/suite/group_replication/t/gr_concurrent_stop_select.test
 share/mysql/test/suite/group_replication/t/gr_concurrent_uninstall_start.test
 share/mysql/test/suite/group_replication/t/gr_concurrent_uninstall_stop.test
 share/mysql/test/suite/group_replication/t/gr_connect_during_delayed_start.test
@@ -4591,6 +4620,31 @@ share/mysql/test/suite/group_replication/t/gr_disjoint_gtids_join_option_depreca
 share/mysql/test/suite/group_replication/t/gr_disregard_nonunique_key.test
 share/mysql/test/suite/group_replication/t/gr_executed_sets_compatibility.cnf
 share/mysql/test/suite/group_replication/t/gr_executed_sets_compatibility.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_applier_error.cnf
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_applier_error.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_lower_version-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_lower_version.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_members_exceeded-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_members_exceeded.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_transaction_mismatch-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_transaction_mismatch.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_wrong_gtid_assignment_block_size.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_wrong_hash_algorithm-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_wrong_hash_algorithm.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_wrong_single_primary_mode-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_join_wrong_single_primary_mode.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_majority_loss.cnf
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_majority_loss.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_member_expel.cnf
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_member_expel.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_recovery.cnf
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_recovery.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_recovery_stage0-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_recovery_stage0.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_start_gr_cmd-slave.opt
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_on_start_gr_cmd.test
+share/mysql/test/suite/group_replication/t/gr_exit_state_action_option.test
 share/mysql/test/suite/group_replication/t/gr_filters.cnf
 share/mysql/test/suite/group_replication/t/gr_filters.test
 share/mysql/test/suite/group_replication/t/gr_flow_control_options.test
@@ -4765,6 +4819,8 @@ share/mysql/test/suite/group_replication/t/gr_recovery_donor_retry.test
 share/mysql/test/suite/group_replication/t/gr_recovery_double_view_update.test
 share/mysql/test/suite/group_replication/t/gr_recovery_fails_to_detect_thread_stop.cnf
 share/mysql/test/suite/group_replication/t/gr_recovery_fails_to_detect_thread_stop.test
+share/mysql/test/suite/group_replication/t/gr_recovery_lower_max_retry_count-slave.opt
+share/mysql/test/suite/group_replication/t/gr_recovery_lower_max_retry_count.test
 share/mysql/test/suite/group_replication/t/gr_recovery_no_donors.cnf
 share/mysql/test/suite/group_replication/t/gr_recovery_no_donors.test
 share/mysql/test/suite/group_replication/t/gr_recovery_no_more_donors.cnf
@@ -4926,6 +4982,7 @@ share/mysql/test/suite/group_replication/t/gr_start_stop_slave_channel.cnf
 share/mysql/test/suite/group_replication/t/gr_start_stop_slave_channel.test
 share/mysql/test/suite/group_replication/t/gr_start_stop_stress.cnf
 share/mysql/test/suite/group_replication/t/gr_start_stop_stress.test
+share/mysql/test/suite/group_replication/t/gr_startup_check_node_seed_skips_own_address.test
 share/mysql/test/suite/group_replication/t/gr_startup_verifications.test
 share/mysql/test/suite/group_replication/t/gr_startup_verifications_not_binlog-master.opt
 share/mysql/test/suite/group_replication/t/gr_startup_verifications_not_binlog-slave.opt
@@ -5064,10 +5121,12 @@ share/mysql/test/suite/innodb/r/default_row_format.result
 share/mysql/test/suite/innodb/r/default_row_format_16k.result
 share/mysql/test/suite/innodb/r/default_row_format_compatibility.result
 share/mysql/test/suite/innodb/r/default_row_format_tablespace.result
+share/mysql/test/suite/innodb/r/deprecate_part_in_shared_ts.result
 share/mysql/test/suite/innodb/r/doublewrite.result
 share/mysql/test/suite/innodb/r/dropdb.result
 share/mysql/test/suite/innodb/r/end_range_check.result
 share/mysql/test/suite/innodb/r/end_range_check_2.result
+share/mysql/test/suite/innodb/r/events-merge-tmp-path.result
 share/mysql/test/suite/innodb/r/file_format_defaults.result
 share/mysql/test/suite/innodb/r/file_format_upgrade_16k.result
 share/mysql/test/suite/innodb/r/flush-hang.result
@@ -5422,11 +5481,14 @@ share/mysql/test/suite/innodb/t/default_row_format.test
 share/mysql/test/suite/innodb/t/default_row_format_16k.test
 share/mysql/test/suite/innodb/t/default_row_format_compatibility.test
 share/mysql/test/suite/innodb/t/default_row_format_tablespace.test
+share/mysql/test/suite/innodb/t/deprecate_part_in_shared_ts.test
 share/mysql/test/suite/innodb/t/disabled.def
 share/mysql/test/suite/innodb/t/doublewrite.test
 share/mysql/test/suite/innodb/t/dropdb.test
 share/mysql/test/suite/innodb/t/end_range_check.test
 share/mysql/test/suite/innodb/t/end_range_check_2.test
+share/mysql/test/suite/innodb/t/events-merge-tmp-path-master.opt
+share/mysql/test/suite/innodb/t/events-merge-tmp-path.test
 share/mysql/test/suite/innodb/t/file_format_defaults-master.opt
 share/mysql/test/suite/innodb/t/file_format_defaults.test
 share/mysql/test/suite/innodb/t/file_format_upgrade_16k.test
@@ -5936,6 +5998,7 @@ share/mysql/test/suite/innodb_gis/r/rtree.result
 share/mysql/test/suite/innodb_gis/r/rtree_compress.result
 share/mysql/test/suite/innodb_gis/r/rtree_compress2.result
 share/mysql/test/suite/innodb_gis/r/rtree_concurrent_srch.result
+share/mysql/test/suite/innodb_gis/r/rtree_concurrent_srch_2.result
 share/mysql/test/suite/innodb_gis/r/rtree_crash.result
 share/mysql/test/suite/innodb_gis/r/rtree_create_inplace.result
 share/mysql/test/suite/innodb_gis/r/rtree_debug.result
@@ -5977,6 +6040,7 @@ share/mysql/test/suite/innodb_gis/t/rtree.test
 share/mysql/test/suite/innodb_gis/t/rtree_compress.test
 share/mysql/test/suite/innodb_gis/t/rtree_compress2.test
 share/mysql/test/suite/innodb_gis/t/rtree_concurrent_srch.test
+share/mysql/test/suite/innodb_gis/t/rtree_concurrent_srch_2.test
 share/mysql/test/suite/innodb_gis/t/rtree_create_inplace.test
 share/mysql/test/suite/innodb_gis/t/rtree_debug.test
 share/mysql/test/suite/innodb_gis/t/rtree_drop_index.test
@@ -6644,6 +6708,7 @@ share/mysql/test/suite/memcached/r/memc285_FTWRL.result
 share/mysql/test/suite/memcached/r/memc290_read_committed.result
 share/mysql/test/suite/memcached/r/memc_297_crash.result
 share/mysql/test/suite/memcached/r/memc_api_disable_rowlock.result
+share/mysql/test/suite/memcached/r/memc_api_trx_level.result
 share/mysql/test/suite/memcached/r/memcached_alter_column.result
 share/mysql/test/suite/memcached/r/memcached_virtual_block.result
 share/mysql/test/suite/memcached/r/rpl_memc270_1.result
@@ -6772,6 +6837,8 @@ share/mysql/test/suite/memcached/t/memc_297_crash-master.opt
 share/mysql/test/suite/memcached/t/memc_297_crash.test
 share/mysql/test/suite/memcached/t/memc_api_disable_rowlock-master.opt
 share/mysql/test/suite/memcached/t/memc_api_disable_rowlock.test
+share/mysql/test/suite/memcached/t/memc_api_trx_level-master.opt
+share/mysql/test/suite/memcached/t/memc_api_trx_level.test
 share/mysql/test/suite/memcached/t/memcached_alter_column-master.opt
 share/mysql/test/suite/memcached/t/memcached_alter_column.test
 share/mysql/test/suite/memcached/t/memcached_virtual_block-master.opt
@@ -9628,6 +9695,7 @@ share/mysql/test/suite/rpl/r/rpl_gtid_server_sighup.result
 share/mysql/test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_insufficient_stmt_cache.result
 share/mysql/test/suite/rpl/r/rpl_gtid_skip_incident_caused_by_partially_failed_grant.result
 share/mysql/test/suite/rpl/r/rpl_gtid_skip_partial_trx.result
+share/mysql/test/suite/rpl/r/rpl_gtid_skip_with_parser_error.result
 share/mysql/test/suite/rpl/r/rpl_gtid_spanned_trx.result
 share/mysql/test/suite/rpl/r/rpl_gtid_split_statements.result
 share/mysql/test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
@@ -9813,6 +9881,7 @@ share/mysql/test/suite/rpl/r/rpl_perfschema_applier_xa_status_check.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_connect_config.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_connect_status.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_no_master_uuid.result
+share/mysql/test/suite/rpl/r/rpl_perfschema_order_by.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_threads_processlist_status.result
 share/mysql/test/suite/rpl/r/rpl_plugin_load.result
 share/mysql/test/suite/rpl/r/rpl_ps.result
@@ -9844,6 +9913,7 @@ share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin_server_sta
 share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin_server_startup_win.result
 share/mysql/test/suite/rpl/r/rpl_report.result
 share/mysql/test/suite/rpl/r/rpl_report_port.result
+share/mysql/test/suite/rpl/r/rpl_reset_restart.result
 share/mysql/test/suite/rpl/r/rpl_reset_slave_all.result
 share/mysql/test/suite/rpl/r/rpl_reset_slave_all_thread_safe.result
 share/mysql/test/suite/rpl/r/rpl_reset_slave_fail.result
@@ -9947,6 +10017,7 @@ share/mysql/test/suite/rpl/r/rpl_seconds_behind_master.result
 share/mysql/test/suite/rpl/r/rpl_seconds_behind_master_mts.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_ack_thread.result
+share/mysql/test/suite/rpl/r/rpl_semi_sync_add_remove_slaves.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_after_sync.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_deadlock.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_event.result
@@ -10349,6 +10420,7 @@ share/mysql/test/suite/rpl/t/rpl_gtid_server_sighup.test
 share/mysql/test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_insufficient_stmt_cache.test
 share/mysql/test/suite/rpl/t/rpl_gtid_skip_incident_caused_by_partially_failed_grant.test
 share/mysql/test/suite/rpl/t/rpl_gtid_skip_partial_trx.test
+share/mysql/test/suite/rpl/t/rpl_gtid_skip_with_parser_error.test
 share/mysql/test/suite/rpl/t/rpl_gtid_spanned_trx.test
 share/mysql/test/suite/rpl/t/rpl_gtid_split_statements.test
 share/mysql/test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
@@ -10518,6 +10590,7 @@ share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order.test
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_config_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_config_error.test
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock.test
+share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_deadlock_error.test
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_error.test
@@ -10649,6 +10722,8 @@ share/mysql/test/suite/rpl/t/rpl_perfschema_applier_xa_status_check.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_connect_config.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_connect_status.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_no_master_uuid.test
+share/mysql/test/suite/rpl/t/rpl_perfschema_order_by.cnf
+share/mysql/test/suite/rpl/t/rpl_perfschema_order_by.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_threads_processlist_status.test
 share/mysql/test/suite/rpl/t/rpl_plugin_load-master.opt
 share/mysql/test/suite/rpl/t/rpl_plugin_load-slave.opt
@@ -10710,6 +10785,8 @@ share/mysql/test/suite/rpl/t/rpl_report-slave.opt
 share/mysql/test/suite/rpl/t/rpl_report.test
 share/mysql/test/suite/rpl/t/rpl_report_port-master.opt
 share/mysql/test/suite/rpl/t/rpl_report_port.test
+share/mysql/test/suite/rpl/t/rpl_reset_restart-slave.opt
+share/mysql/test/suite/rpl/t/rpl_reset_restart.test
 share/mysql/test/suite/rpl/t/rpl_reset_slave_all.test
 share/mysql/test/suite/rpl/t/rpl_reset_slave_all_thread_safe.test
 share/mysql/test/suite/rpl/t/rpl_reset_slave_fail.test
@@ -10852,6 +10929,10 @@ share/mysql/test/suite/rpl/t/rpl_semi_sync_ack_thread-master.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_ack_thread-slave.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_ack_thread.cnf
 share/mysql/test/suite/rpl/t/rpl_semi_sync_ack_thread.test
+share/mysql/test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-master.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_add_remove_slaves-slave.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.cnf
+share/mysql/test/suite/rpl/t/rpl_semi_sync_add_remove_slaves.test
 share/mysql/test/suite/rpl/t/rpl_semi_sync_after_sync-master.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_after_sync-slave.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_after_sync.test
@@ -14009,6 +14090,7 @@ share/mysql/test/t/overflow.test
 share/mysql/test/t/packet.test
 share/mysql/test/t/parser-big-32bit.test
 share/mysql/test/t/parser-big-64bit.test
+share/mysql/test/t/parser-master.opt
 share/mysql/test/t/parser.test
 share/mysql/test/t/parser_bug21114_innodb.test
 share/mysql/test/t/parser_not_embedded.test
@@ -14293,6 +14375,7 @@ share/mysql/test/t/strict_autoinc_3heap.test
 share/mysql/test/t/subquery_all.test
 share/mysql/test/t/subquery_all_bka.test
 share/mysql/test/t/subquery_all_bka_nixbnl.test
+share/mysql/test/t/subquery_bugs.test
 share/mysql/test/t/subquery_mat.test
 share/mysql/test/t/subquery_mat_all.test
 share/mysql/test/t/subquery_mat_none.test