Pullup ticket #4374 - requested by taca

databases/mysql56-client: security update
databases/mysql56-server: update to keep in sync with with "mysql56-client"

Revisions pulled up:
- databases/mysql56-client/Makefile.common                      1.14
- databases/mysql56-client/distinfo                             1.14
- databases/mysql56-server/PLIST                                1.9

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Mon Mar 31 10:32:13 UTC 2014

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

   Log Message:
   Changes 5.6.17:

   Functionality Added or Changed

   Incompatible Change: The AES_ENCRYPT() and AES_DECRYPT() functions now permit control of the block encryption mode and take an optional initialization vector argument:

   The new block_encryption_mode system variable controls the mode for block-based encryption algorithms. Its default value is aes-128-ecb, which signifies encryption using a key length of 128 bits and ECB mode.

   An optional init_vector argument provides an initialization vector for encryption modes that require it:

   AES_ENCRYPT(str,key_str[,init_vector])
   AES_DECRYPT(crypt_str,key_str[,init_vector])
   A random string of bytes to use for the initialization vector can be produced by calling the new RANDOM_BYTES() function.

   For more information, see Encryption and Compression Functions.

   These changes make statements that use AES_ENCRYPT() or AES_DECRYPT() unsafe for statement-based replication and they cannot be stored in the query cache. Queries that use RANDOM_BYTES() are unsafe for statement-based replication and cannot be stored in the query cache.

   Incompatible Change: The ERROR_FOR_DIVISION_BY_ZERO, NO_ZERO_DATE, and NO_ZERO_IN_DATE SQL modes now are deprecated and setting the sql_mode value to include any of them generates a warning. In MySQL 5.7, these modes do nothing. Instead, their effects are included in the effects of strict SQL mode (STRICT_ALL_TABLES or STRICT_TRANS_TABLES). The motivation for the change in MySQL 5.7 is to reduce the number of SQL modes with an effect dependent on strict mode and make them part of strict mode itself.

   To make advance preparation for an upgrade to MySQL 5.7, see SQL Mode Changes in MySQL 5.7. That discussion provides guidelines to assess whether your applications will be affected by the SQL mode changes in MySQL 5.7.

   InnoDB: MySQL now supports rebuilding regular and partitioned InnoDB tables using online DDL (ALGORITHM=INPLACE) for the following operations:

   OPTIMIZE TABLE

   ALTER TABLE ... FORCE

   ALTER TABLE ... ENGINE=INNODB (when run on an InnoDB table)

   Online DDL support reduces table rebuild time and permits concurrent DML, which helps reduce user application downtime. For additional information, see Overview of Online DDL.

   On Solaris, mysql_config --libs now includes -R/path/to/library so that libraries can be found at runtime.

   mysql_install_db provides a more informative diagnostic message when required Perl modules are missing.

   The IGNORE clause for ALTER TABLE is now deprecated and will be removed in a future version of MySQL. ALTER IGNORE TABLE causes problems for replication, prevents online ALTER TABLE for unique index creation, and causes problems with foreign keys (rows removed in the parent table).

   Bugs Fixed

3 files changed, 96 insertions, 11 deletions

diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index e25449f2d78..2bda5ae9cb4 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2014/02/13 07:49:56 adam Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2014/04/14 17:14:13 tron Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.16
+DISTNAME=	mysql-5.6.17
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index cf09ada5ad8..58883221834 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2014/02/13 14:38:08 jperkin Exp $
+$NetBSD: distinfo,v 1.13.2.1 2014/04/14 17:14:13 tron Exp $
 
-SHA1 (mysql-5.6.16.tar.gz) = 64a3b4058e2039d2b812d23c8793f74b4f168cc0
-RMD160 (mysql-5.6.16.tar.gz) = 11d21eb50e63776876dccf3a72e19e5de4eec9c2
-Size (mysql-5.6.16.tar.gz) = 32821451 bytes
+SHA1 (mysql-5.6.17.tar.gz) = 53773d619d7f7bc1743f92fd65885a0581c37ff8
+RMD160 (mysql-5.6.17.tar.gz) = 8bee91a701210d846d1f9523d948a86891873a15
+Size (mysql-5.6.17.tar.gz) = 32862539 bytes
 SHA1 (patch-CMakeLists.txt) = b3d0bfc9a23ddbb1ea415e16c35c86e190857bba
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index 2fcf2fd89aa..81e83fe941f 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:00 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2014/04/14 17:14:13 tron Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -221,11 +221,13 @@ share/mysql/test/extra/binlog_tests/mysqlbinlog_start_stop_2.inc
 share/mysql/test/extra/rpl_tests/check_type.inc
 share/mysql/test/extra/rpl_tests/create_recursive_construct.inc
 share/mysql/test/extra/rpl_tests/delayed_slave_wait_on_query.inc
+share/mysql/test/extra/rpl_tests/grep_pattern.inc
 share/mysql/test/extra/rpl_tests/rpl_EE_err.test
 share/mysql/test/extra/rpl_tests/rpl_auto_increment.test
 share/mysql/test/extra/rpl_tests/rpl_auto_increment_insert_view.test
 share/mysql/test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test
 share/mysql/test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test
+share/mysql/test/extra/rpl_tests/rpl_binlog_error.inc
 share/mysql/test/extra/rpl_tests/rpl_binlog_max_cache_size.test
 share/mysql/test/extra/rpl_tests/rpl_blackhole.test
 share/mysql/test/extra/rpl_tests/rpl_change_master.test
@@ -239,6 +241,8 @@ share/mysql/test/extra/rpl_tests/rpl_crash_safe.test
 share/mysql/test/extra/rpl_tests/rpl_ddl.test
 share/mysql/test/extra/rpl_tests/rpl_deadlock.test
 share/mysql/test/extra/rpl_tests/rpl_delete_no_where.test
+share/mysql/test/extra/rpl_tests/rpl_do_table_filter_insensitive.inc
+share/mysql/test/extra/rpl_tests/rpl_do_table_filter_sensitive.inc
 share/mysql/test/extra/rpl_tests/rpl_drop_create_temp_table.inc
 share/mysql/test/extra/rpl_tests/rpl_drop_create_temp_table.test
 share/mysql/test/extra/rpl_tests/rpl_extra_col_master.test
@@ -248,13 +252,18 @@ share/mysql/test/extra/rpl_tests/rpl_filters.test
 share/mysql/test/extra/rpl_tests/rpl_flsh_tbls.test
 share/mysql/test/extra/rpl_tests/rpl_foreign_key.test
 share/mysql/test/extra/rpl_tests/rpl_get_master_version_and_clock.test
+share/mysql/test/extra/rpl_tests/rpl_heartbeat_2slaves.inc
+share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_insensitive.inc
+share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_sensitive.inc
 share/mysql/test/extra/rpl_tests/rpl_implicit_commit_binlog.test
 share/mysql/test/extra/rpl_tests/rpl_innodb.test
 share/mysql/test/extra/rpl_tests/rpl_insert_delayed.test
 share/mysql/test/extra/rpl_tests/rpl_insert_id.test
 share/mysql/test/extra/rpl_tests/rpl_insert_id_pk.test
 share/mysql/test/extra/rpl_tests/rpl_insert_ignore.test
+share/mysql/test/extra/rpl_tests/rpl_insert_ignore_gtid_on.inc
 share/mysql/test/extra/rpl_tests/rpl_loaddata.test
+share/mysql/test/extra/rpl_tests/rpl_loaddata_s.inc
 share/mysql/test/extra/rpl_tests/rpl_loadfile.test
 share/mysql/test/extra/rpl_tests/rpl_log.test
 share/mysql/test/extra/rpl_tests/rpl_lower_case_table_names.test
@@ -280,11 +289,13 @@ share/mysql/test/extra/rpl_tests/rpl_row_basic.test
 share/mysql/test/extra/rpl_tests/rpl_row_blob.test
 share/mysql/test/extra/rpl_tests/rpl_row_delayed_ins.test
 share/mysql/test/extra/rpl_tests/rpl_row_empty_imgs.test
+share/mysql/test/extra/rpl_tests/rpl_row_event_max_size.inc
 share/mysql/test/extra/rpl_tests/rpl_row_func003.test
 share/mysql/test/extra/rpl_tests/rpl_row_idempotency.test
 share/mysql/test/extra/rpl_tests/rpl_row_img.test
 share/mysql/test/extra/rpl_tests/rpl_row_img_blobs.test
 share/mysql/test/extra/rpl_tests/rpl_row_img_diff_indexes.test
+share/mysql/test/extra/rpl_tests/rpl_row_show_relaylog_events.inc
 share/mysql/test/extra/rpl_tests/rpl_row_sp002.test
 share/mysql/test/extra/rpl_tests/rpl_row_sp003.test
 share/mysql/test/extra/rpl_tests/rpl_row_sp006.test
@@ -297,6 +308,8 @@ share/mysql/test/extra/rpl_tests/rpl_show_relaylog_events.inc
 share/mysql/test/extra/rpl_tests/rpl_start_stop_slave.test
 share/mysql/test/extra/rpl_tests/rpl_stm_EE_err2.test
 share/mysql/test/extra/rpl_tests/rpl_stm_create_if_not_exists.test
+share/mysql/test/extra/rpl_tests/rpl_stm_insert_delayed.inc
+share/mysql/test/extra/rpl_tests/rpl_stm_mix_show_relaylog_events.inc
 share/mysql/test/extra/rpl_tests/rpl_stop_middle_group.test
 share/mysql/test/extra/rpl_tests/rpl_stop_slave.test
 share/mysql/test/extra/rpl_tests/rpl_stress_test.inc
@@ -393,6 +406,7 @@ share/mysql/test/include/file_does_not_exist.inc
 share/mysql/test/include/filter_file.inc
 share/mysql/test/include/force_restart.inc
 share/mysql/test/include/force_restart_if_skipped.inc
+share/mysql/test/include/func_aes_block.inc
 share/mysql/test/include/func_in.inc
 share/mysql/test/include/function_defaults.inc
 share/mysql/test/include/function_defaults_notembedded.inc
@@ -984,6 +998,12 @@ share/mysql/test/r/fulltext_order_by.result
 share/mysql/test/r/fulltext_plugin.result
 share/mysql/test/r/fulltext_update.result
 share/mysql/test/r/fulltext_var.result
+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_misc.result
+share/mysql/test/r/func_aes_ofb.result
 share/mysql/test/r/func_analyse.result
 share/mysql/test/r/func_compress.result
 share/mysql/test/r/func_concat.result
@@ -1335,6 +1355,8 @@ share/mysql/test/r/partition_explicit_prune.result
 share/mysql/test/r/partition_federated.result
 share/mysql/test/r/partition_grant.result
 share/mysql/test/r/partition_hash.result
+share/mysql/test/r/partition_index_innodb.result
+share/mysql/test/r/partition_index_myisam.result
 share/mysql/test/r/partition_innodb.result
 share/mysql/test/r/partition_innodb_plugin.result
 share/mysql/test/r/partition_innodb_semi_consistent.result
@@ -3341,6 +3363,8 @@ share/mysql/test/suite/innodb/include/innodb_dict.inc
 share/mysql/test/suite/innodb/include/innodb_stats.inc
 share/mysql/test/suite/innodb/include/innodb_stats_table_flag.inc
 share/mysql/test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
+share/mysql/test/suite/innodb/r/blob-update-debug.result
+share/mysql/test/suite/innodb/r/create-index.result
 share/mysql/test/suite/innodb/r/innodb-2byte-collation.result
 share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result
 share/mysql/test/suite/innodb/r/innodb-alter-autoinc.result
@@ -3361,6 +3385,7 @@ share/mysql/test/suite/innodb/r/innodb-bug12552164.result
 share/mysql/test/suite/innodb/r/innodb-bug14219515.result
 share/mysql/test/suite/innodb/r/innodb-change-buffer-recovery.result
 share/mysql/test/suite/innodb/r/innodb-consistent.result
+share/mysql/test/suite/innodb/r/innodb-double-write.result
 share/mysql/test/suite/innodb/r/innodb-index-debug.result
 share/mysql/test/suite/innodb/r/innodb-index-online-delete.result
 share/mysql/test/suite/innodb/r/innodb-index-online-fk.result
@@ -3382,6 +3407,7 @@ share/mysql/test/suite/innodb/r/innodb-tablespace.result
 share/mysql/test/suite/innodb/r/innodb-timeout.result
 share/mysql/test/suite/innodb/r/innodb-truncate.result
 share/mysql/test/suite/innodb/r/innodb-ucs2.result
+share/mysql/test/suite/innodb/r/innodb-update-insert.result
 share/mysql/test/suite/innodb/r/innodb-use-sys-malloc.result
 share/mysql/test/suite/innodb/r/innodb-wl5522-1.result
 share/mysql/test/suite/innodb/r/innodb-wl5522-debug.result
@@ -3503,6 +3529,8 @@ share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
 share/mysql/test/suite/innodb/r/innodb_trx_weight.result
 share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
 share/mysql/test/suite/innodb/r/innodb_ut_format_name.result
+share/mysql/test/suite/innodb/t/blob-update-debug.test
+share/mysql/test/suite/innodb/t/create-index.test
 share/mysql/test/suite/innodb/t/disabled.def
 share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt
 share/mysql/test/suite/innodb/t/innodb-2byte-collation.test
@@ -3530,6 +3558,7 @@ share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
 share/mysql/test/suite/innodb/t/innodb-change-buffer-recovery.test
 share/mysql/test/suite/innodb/t/innodb-consistent-master.opt
 share/mysql/test/suite/innodb/t/innodb-consistent.test
+share/mysql/test/suite/innodb/t/innodb-double-write.test
 share/mysql/test/suite/innodb/t/innodb-index-debug.test
 share/mysql/test/suite/innodb/t/innodb-index-online-delete.test
 share/mysql/test/suite/innodb/t/innodb-index-online-fk.test
@@ -3555,6 +3584,7 @@ share/mysql/test/suite/innodb/t/innodb-tablespace.test
 share/mysql/test/suite/innodb/t/innodb-timeout.test
 share/mysql/test/suite/innodb/t/innodb-truncate.test
 share/mysql/test/suite/innodb/t/innodb-ucs2.test
+share/mysql/test/suite/innodb/t/innodb-update-insert.test
 share/mysql/test/suite/innodb/t/innodb-use-sys-malloc-master.opt
 share/mysql/test/suite/innodb/t/innodb-use-sys-malloc.test
 share/mysql/test/suite/innodb/t/innodb-wl5522-1.test
@@ -6036,6 +6066,7 @@ share/mysql/test/suite/rpl/r/rpl_extra_row_data.result
 share/mysql/test/suite/rpl/r/rpl_failed_optimize.result
 share/mysql/test/suite/rpl/r/rpl_filter_database.result
 share/mysql/test/suite/rpl/r/rpl_filter_tables_not_exist.result
+share/mysql/test/suite/rpl/r/rpl_filter_warnings.result
 share/mysql/test/suite/rpl/r/rpl_flush_logs.result
 share/mysql/test/suite/rpl/r/rpl_flushlog_loop.result
 share/mysql/test/suite/rpl/r/rpl_foreign_key_innodb.result
@@ -6048,14 +6079,25 @@ share/mysql/test/suite/rpl/r/rpl_get_master_version_and_clock.result
 share/mysql/test/suite/rpl/r/rpl_grant.result
 share/mysql/test/suite/rpl/r/rpl_grant_plugin.result
 share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result
+share/mysql/test/suite/rpl/r/rpl_gtid_binlog_errors.result
+share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_insensitive.result
+share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_sensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_empty_group.result
 share/mysql/test/suite/rpl/r/rpl_gtid_execution.result
 share/mysql/test/suite/rpl/r/rpl_gtid_failover.result
+share/mysql/test/suite/rpl/r/rpl_gtid_heartbeat_2slave.result
+share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_insensitive.result
+share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result
+share/mysql/test/suite/rpl/r/rpl_gtid_loaddata_s.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode.result
 share/mysql/test/suite/rpl/r/rpl_gtid_parallel.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_maintained.result
+share/mysql/test/suite/rpl/r/rpl_gtid_row_event_max_size.result
+share/mysql/test/suite/rpl/r/rpl_gtid_row_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
+share/mysql/test/suite/rpl/r/rpl_gtid_stm_insert_delayed.result
+share/mysql/test/suite/rpl/r/rpl_gtid_stm_mix_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_gtid_stress_failover.result
 share/mysql/test/suite/rpl/r/rpl_heartbeat.result
 share/mysql/test/suite/rpl/r/rpl_heartbeat_2slaves.result
@@ -6163,6 +6205,7 @@ share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.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_replicate_do.result
+share/mysql/test/suite/rpl/r/rpl_replicate_event_after_sync_stage.result
 share/mysql/test/suite/rpl/r/rpl_replicate_ignore_db.result
 share/mysql/test/suite/rpl/r/rpl_replicate_rewrite_db.result
 share/mysql/test/suite/rpl/r/rpl_report.result
@@ -6281,6 +6324,7 @@ share/mysql/test/suite/rpl/r/rpl_show_slave_running.result
 share/mysql/test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
 share/mysql/test/suite/rpl/r/rpl_skip_error.result
 share/mysql/test/suite/rpl/r/rpl_skip_incident.result
+share/mysql/test/suite/rpl/r/rpl_skip_slave_err_warnings.result
 share/mysql/test/suite/rpl/r/rpl_slave_grp_exec.result
 share/mysql/test/suite/rpl/r/rpl_slave_load_in.result
 share/mysql/test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
@@ -6466,6 +6510,8 @@ share/mysql/test/suite/rpl/t/rpl_filter_database-slave.opt
 share/mysql/test/suite/rpl/t/rpl_filter_database.test
 share/mysql/test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
 share/mysql/test/suite/rpl/t/rpl_filter_tables_not_exist.test
+share/mysql/test/suite/rpl/t/rpl_filter_warnings-slave.opt
+share/mysql/test/suite/rpl/t/rpl_filter_warnings.test
 share/mysql/test/suite/rpl/t/rpl_flush_logs-master.opt
 share/mysql/test/suite/rpl/t/rpl_flush_logs.test
 share/mysql/test/suite/rpl/t/rpl_flushlog_loop-master.opt
@@ -6485,6 +6531,14 @@ share/mysql/test/suite/rpl/t/rpl_grant_plugin-master.opt
 share/mysql/test/suite/rpl/t/rpl_grant_plugin-slave.opt
 share/mysql/test/suite/rpl/t/rpl_grant_plugin.test
 share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock.test
+share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors.test
+share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive.test
+share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive.test
 share/mysql/test/suite/rpl/t/rpl_gtid_empty_group-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_empty_group-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_empty_group.test
@@ -6493,15 +6547,29 @@ share/mysql/test/suite/rpl/t/rpl_gtid_execution-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_execution.test
 share/mysql/test/suite/rpl/t/rpl_gtid_failover.cnf
 share/mysql/test/suite/rpl/t/rpl_gtid_failover.test
+share/mysql/test/suite/rpl/t/rpl_gtid_heartbeat_2slave.cnf
+share/mysql/test/suite/rpl/t/rpl_gtid_heartbeat_2slave.test
+share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive.test
+share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test
+share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode.test
-share/mysql/test/suite/rpl/t/rpl_gtid_parallel-master.opt
-share/mysql/test/suite/rpl/t/rpl_gtid_parallel-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_parallel.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_maintained.test
+share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size.test
+share/mysql/test/suite/rpl/t/rpl_gtid_row_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
+share/mysql/test/suite/rpl/t/rpl_gtid_stm_insert_delayed.test
+share/mysql/test/suite/rpl/t/rpl_gtid_stm_mix_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.cnf
 share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.test
 share/mysql/test/suite/rpl/t/rpl_heartbeat-master.opt
@@ -6622,8 +6690,6 @@ share/mysql/test/suite/rpl/t/rpl_multi_update3.test
 share/mysql/test/suite/rpl/t/rpl_multi_update4-slave.opt
 share/mysql/test/suite/rpl/t/rpl_multi_update4.test
 share/mysql/test/suite/rpl/t/rpl_mysql_upgrade.test
-share/mysql/test/suite/rpl/t/rpl_mysqlbinlog_gtid_on-master.opt
-share/mysql/test/suite/rpl/t/rpl_mysqlbinlog_gtid_on-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mysqlbinlog_gtid_on.test
 share/mysql/test/suite/rpl/t/rpl_name_const.test
 share/mysql/test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
@@ -6684,6 +6750,7 @@ share/mysql/test/suite/rpl/t/rpl_relayspace-slave.opt
 share/mysql/test/suite/rpl/t/rpl_relayspace.test
 share/mysql/test/suite/rpl/t/rpl_replicate_do-slave.opt
 share/mysql/test/suite/rpl/t/rpl_replicate_do.test
+share/mysql/test/suite/rpl/t/rpl_replicate_event_after_sync_stage.test
 share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt
 share/mysql/test/suite/rpl/t/rpl_replicate_ignore_db.test
 share/mysql/test/suite/rpl/t/rpl_replicate_rewrite_db.test
@@ -6833,8 +6900,10 @@ share/mysql/test/suite/rpl/t/rpl_sequential-master.opt
 share/mysql/test/suite/rpl/t/rpl_sequential-slave.opt
 share/mysql/test/suite/rpl/t/rpl_sequential.test
 share/mysql/test/suite/rpl/t/rpl_server_id1.test
+share/mysql/test/suite/rpl/t/rpl_server_id2-master.opt
 share/mysql/test/suite/rpl/t/rpl_server_id2-slave.opt
 share/mysql/test/suite/rpl/t/rpl_server_id2.test
+share/mysql/test/suite/rpl/t/rpl_server_id_ignore-master.opt
 share/mysql/test/suite/rpl/t/rpl_server_id_ignore-slave.opt
 share/mysql/test/suite/rpl/t/rpl_server_id_ignore.test
 share/mysql/test/suite/rpl/t/rpl_server_uuid.cnf
@@ -6856,6 +6925,8 @@ share/mysql/test/suite/rpl/t/rpl_skip_error.test
 share/mysql/test/suite/rpl/t/rpl_skip_incident-master.opt
 share/mysql/test/suite/rpl/t/rpl_skip_incident-slave.opt
 share/mysql/test/suite/rpl/t/rpl_skip_incident.test
+share/mysql/test/suite/rpl/t/rpl_skip_slave_err_warnings-slave.opt
+share/mysql/test/suite/rpl/t/rpl_skip_slave_err_warnings.test
 share/mysql/test/suite/rpl/t/rpl_slave_grp_exec.test
 share/mysql/test/suite/rpl/t/rpl_slave_load_in.test
 share/mysql/test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
@@ -7094,6 +7165,7 @@ share/mysql/test/suite/sys_vars/r/binlog_row_image_basic.result
 share/mysql/test/suite/sys_vars/r/binlog_rows_query_log_events_basic.result
 share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result
 share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
+share/mysql/test/suite/sys_vars/r/block_encryption_mode_basic.result
 share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
 share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
 share/mysql/test/suite/sys_vars/r/character_set_client_basic.result
@@ -7230,6 +7302,7 @@ share/mysql/test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_doublewrite_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_doublewrite_batch_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_format_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_format_check_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_format_max_basic.result
@@ -7297,6 +7370,7 @@ share/mysql/test/suite/sys_vars/r/innodb_read_only_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_replication_delay_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_rollback_segments_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_stats_auto_recalc_basic.result
@@ -7685,6 +7759,7 @@ share/mysql/test/suite/sys_vars/t/binlog_row_image_basic.test
 share/mysql/test/suite/sys_vars/t/binlog_rows_query_log_events_basic.test
 share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
 share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
+share/mysql/test/suite/sys_vars/t/block_encryption_mode_basic.test
 share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
 share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
 share/mysql/test/suite/sys_vars/t/character_set_client_basic.test
@@ -7832,6 +7907,7 @@ share/mysql/test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_doublewrite_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_doublewrite_batch_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_format_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_format_check_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic-master.opt
@@ -7901,6 +7977,7 @@ share/mysql/test/suite/sys_vars/t/innodb_read_only_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_replication_delay_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_rollback_segments_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_stats_auto_recalc_basic.test
@@ -8526,6 +8603,12 @@ share/mysql/test/t/fulltext_plugin-master.opt
 share/mysql/test/t/fulltext_plugin.test
 share/mysql/test/t/fulltext_update.test
 share/mysql/test/t/fulltext_var.test
+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_misc.test
+share/mysql/test/t/func_aes_ofb.test
 share/mysql/test/t/func_analyse.test
 share/mysql/test/t/func_compress.test
 share/mysql/test/t/func_concat.test
@@ -8887,6 +8970,8 @@ share/mysql/test/t/partition_explicit_prune.test
 share/mysql/test/t/partition_federated.test
 share/mysql/test/t/partition_grant.test
 share/mysql/test/t/partition_hash.test
+share/mysql/test/t/partition_index_innodb.test
+share/mysql/test/t/partition_index_myisam.test
 share/mysql/test/t/partition_innodb.test
 share/mysql/test/t/partition_innodb_plugin.test
 share/mysql/test/t/partition_innodb_semi_consistent-master.opt