Update databases/mysql-cluster to 7.4.10.

7.4.10

- A serious regression was inadvertently introduced in MySQL Cluster NDB
  7.4.8 whereby local checkpoints and thus restarts often took much longer
  than expected.

See more at:

  http://dev.mysql.com/doc/relnotes/mysql-cluster/7.4/en/mysql-cluster-news-7-4-10.html


7.4.9

- Important Change: Previously, the NDB scheduler always optimized for
  speed against throughput in a predetermined manner (this was hard coded);
  this balance can now be set using the SchedulerResponsiveness data node
  configuration parameter.
- Added the tc_time_track_stats table to the ndbinfo information database.
- Cluster Replication: Normally, RESET SLAVE causes all entries to be
  deleted from the mysql.ndb_apply_status table. This release adds
  the ndb_clear_apply_status system variable, which makes it possible
  to override this behavior.

See more at:

  http://dev.mysql.com/doc/relnotes/mysql-cluster/7.4/en/mysql-cluster-news-7-4-9.html


7.4.8

- Changes have been made in the minimum values for a number of parameters
  applying to data buffers for backups and LCPs. These parameters, listed
  here, can no longer be set so as to make the system impossible to run:
  - BackupDataBufferSize: minimum increased from 0 to 2M.
  - BackupLogBufferSize: minimum increased from 0 to 2M.
  - BackupWriteSize: minimum increased from 2K to 32K.
  - BackupMaxWriteSize: minimum increased from 2K to 256K.
  In addition, the BackupMemory data node parameter is now deprecated and
  subject to removal in a future version of MySQL Cluster. Use
  BackupDataBufferSize and BackupLogBufferSize instead.
- When a backup was unsuccessful due to insufficient resourcesa subsequent
  retry worked only for those parts of the backup that worked in the same
  thread, since delayed signals are only supported in the same thread.
  Delayed signals are no longer sent to other threads in such cases.
- An instance of an internal list object used in searching for queued
  scans was not actually destroyed before calls to functions that could
  manipulate the base object used to create it.
- ACC scans were queued in the category of range scans, which could lead
  to starting an ACC scan when DBACC had no free slots for scans. We fix
  this by implementing a separate queue for ACC scans.
- Cluster Replication: Added the create_old_temporals server system
  variable to compliment the system variables avoid_temporal_upgrade and
  show_old_temporals introduced in MySQL 5.6.24 and available in MySQL
  Cluster beginning with NDB 7.3.9 and NDB 7.4.6.
- When the --database option has not been specified for ndb_show_tables,
  and no tables are found in the TEST_DB database, an appropriate warning
  message is now issued.
- Bug fixes.

See more at

  http://dev.mysql.com/doc/relnotes/mysql-cluster/7.4/en/mysql-cluster-news-7-4-8.html

4 files changed, 98 insertions, 26 deletions

diff --git a/databases/mysql-cluster/Makefile b/databases/mysql-cluster/Makefile
index 75edfd34573..a7adf95f4f4 100644
--- a/databases/mysql-cluster/Makefile
+++ b/databases/mysql-cluster/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2016/03/05 11:27:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2016/03/09 21:51:45 fhajny Exp $
 
 PKGNAME=		${DISTNAME:S/-gpl//}
-PKGREVISION=		1
 COMMENT=		MySQL Cluster 7.4, a free SQL clustered database
 
 CONFLICTS=		mysql*-{client,server}-[0-9]*
diff --git a/databases/mysql-cluster/Makefile.common b/databases/mysql-cluster/Makefile.common
index 23c5a8de259..62d993d9996 100644
--- a/databases/mysql-cluster/Makefile.common
+++ b/databases/mysql-cluster/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.9 2016/02/25 11:46:21 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.10 2016/03/09 21:51:45 fhajny Exp $
 #
 # used by databases/mysql-cluster/Makefile
 
-DISTNAME=	mysql-cluster-gpl-7.4.7
+DISTNAME=	mysql-cluster-gpl-7.4.10
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-Cluster-7.4/}
 
diff --git a/databases/mysql-cluster/PLIST b/databases/mysql-cluster/PLIST
index 0e857d7270c..aadb95a3751 100644
--- a/databases/mysql-cluster/PLIST
+++ b/databases/mysql-cluster/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2015/09/07 04:33:06 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/03/09 21:51:45 fhajny Exp $
 bin/innochecksum
 bin/mcc_config.py
 bin/memclient
@@ -6149,6 +6149,7 @@ share/mysql/test/collections/default.daily-valgrind
 share/mysql/test/collections/default.experimental
 share/mysql/test/collections/default.push
 share/mysql/test/collections/default.push-valgrind
+share/mysql/test/collections/default.push-vanilla
 share/mysql/test/collections/default.release
 share/mysql/test/collections/default.release.done
 share/mysql/test/collections/default.weekly
@@ -6216,6 +6217,7 @@ 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_gtid_drop_table.inc
+share/mysql/test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test
 share/mysql/test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test
 share/mysql/test/extra/rpl_tests/rpl_heartbeat_2slaves.inc
 share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_insensitive.inc
@@ -6250,6 +6252,7 @@ share/mysql/test/extra/rpl_tests/rpl_partition.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_reset_slave.test
+share/mysql/test/extra/rpl_tests/rpl_rollback_to_savepoint.inc
 share/mysql/test/extra/rpl_tests/rpl_row_001.test
 share/mysql/test/extra/rpl_tests/rpl_row_UUID.test
 share/mysql/test/extra/rpl_tests/rpl_row_basic.test
@@ -6462,6 +6465,7 @@ share/mysql/test/include/have_ndbapi_examples.inc
 share/mysql/test/include/have_nodebug.inc
 share/mysql/test/include/have_not_innodb_plugin.inc
 share/mysql/test/include/have_null_audit_plugin.inc
+share/mysql/test/include/have_numa.inc
 share/mysql/test/include/have_openssl.inc
 share/mysql/test/include/have_optimizer_trace.inc
 share/mysql/test/include/have_outfile.inc
@@ -6547,6 +6551,7 @@ share/mysql/test/include/ndb_backup.inc
 share/mysql/test/include/ndb_backup_id.inc
 share/mysql/test/include/ndb_backup_print.inc
 share/mysql/test/include/ndb_default_cluster.inc
+share/mysql/test/include/ndb_index_stat_wait.inc
 share/mysql/test/include/ndb_not_readonly.inc
 share/mysql/test/include/ndb_restore_master.inc
 share/mysql/test/include/ndb_restore_slave_eoption.inc
@@ -6940,6 +6945,7 @@ share/mysql/test/r/drop_debug.result
 share/mysql/test/r/ds_mrr-big.result
 share/mysql/test/r/dynamic_tracing.result
 share/mysql/test/r/empty_table.result
+share/mysql/test/r/enable_cleartext_plugin.result
 share/mysql/test/r/endspace.result
 share/mysql/test/r/eq_range_idx_stat.result
 share/mysql/test/r/error_simulation.result
@@ -7022,6 +7028,8 @@ share/mysql/test/r/func_rollback.result
 share/mysql/test/r/func_sapdb.result
 share/mysql/test/r/func_set.result
 share/mysql/test/r/func_str.result
+share/mysql/test/r/func_str_debug.result
+share/mysql/test/r/func_str_no_ps.result
 share/mysql/test/r/func_system.result
 share/mysql/test/r/func_test.result
 share/mysql/test/r/func_time.result
@@ -7199,11 +7207,11 @@ share/mysql/test/r/lowercase0.require
 share/mysql/test/r/lowercase1.require
 share/mysql/test/r/lowercase2.require
 share/mysql/test/r/lowercase_fs_off.result
+share/mysql/test/r/lowercase_fs_on.result
 share/mysql/test/r/lowercase_mixed_tmpdir.result
 share/mysql/test/r/lowercase_mixed_tmpdir_innodb.result
 share/mysql/test/r/lowercase_table.result
 share/mysql/test/r/lowercase_table2.result
-share/mysql/test/r/lowercase_table3.result
 share/mysql/test/r/lowercase_table4.result
 share/mysql/test/r/lowercase_table_grant.result
 share/mysql/test/r/lowercase_table_qcache.result
@@ -7214,7 +7222,6 @@ share/mysql/test/r/merge-big.result
 share/mysql/test/r/merge.result
 share/mysql/test/r/merge_innodb.result
 share/mysql/test/r/merge_mmap.result
-share/mysql/test/r/merge_recover.result
 share/mysql/test/r/metadata.result
 share/mysql/test/r/mix2_myisam.result
 share/mysql/test/r/mix2_myisam_ucs2.result
@@ -7245,6 +7252,7 @@ share/mysql/test/r/myisam_mrr_cost_all.result
 share/mysql/test/r/myisam_mrr_cost_icp.result
 share/mysql/test/r/myisam_mrr_icp.result
 share/mysql/test/r/myisam_mrr_none.result
+share/mysql/test/r/myisam_recover.result
 share/mysql/test/r/myisam_row_rpl.result
 share/mysql/test/r/myisampack.result
 share/mysql/test/r/mysql-bug41486.result
@@ -7512,6 +7520,7 @@ share/mysql/test/r/ssl_crl_crlpath.result
 share/mysql/test/r/status.result
 share/mysql/test/r/status2.result
 share/mysql/test/r/status_bug17954.result
+share/mysql/test/r/status_debug.result
 share/mysql/test/r/strict.result
 share/mysql/test/r/strict_autoinc_1myisam.result
 share/mysql/test/r/strict_autoinc_2innodb.result
@@ -7666,6 +7675,8 @@ share/mysql/test/std_data/binlog_transaction.000001
 share/mysql/test/std_data/binlog_transaction_with_GTID.000001
 share/mysql/test/std_data/binlog_transaction_with_anonymous_GTID.000001
 share/mysql/test/std_data/bug15328.cnf
+share/mysql/test/std_data/bug16171518_1.dat
+share/mysql/test/std_data/bug16171518_2.dat
 share/mysql/test/std_data/bug16266.000001
 share/mysql/test/std_data/bug17532932.MYD
 share/mysql/test/std_data/bug17532932.MYI
@@ -7955,6 +7966,7 @@ share/mysql/test/suite/binlog/r/binlog_variables_relay_log.result
 share/mysql/test/suite/binlog/r/binlog_variables_relay_log_index.result
 share/mysql/test/suite/binlog/r/binlog_write_error.result
 share/mysql/test/suite/binlog/r/binlog_xa_handling.result
+share/mysql/test/suite/binlog/r/show_binlog_events_no_lock.result
 share/mysql/test/suite/binlog/std_data/binlog_old_version_4_1.000001
 share/mysql/test/suite/binlog/std_data/bug11747887-bin.000003
 share/mysql/test/suite/binlog/std_data/bug32407.001
@@ -7979,6 +7991,7 @@ share/mysql/test/suite/binlog/t/binlog_database.test
 share/mysql/test/suite/binlog/t/binlog_delete_and_flush_index.test
 share/mysql/test/suite/binlog/t/binlog_drop_if_exists.test
 share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency.test
+share/mysql/test/suite/binlog/t/binlog_error_action-master.opt
 share/mysql/test/suite/binlog/t/binlog_error_action.test
 share/mysql/test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
 share/mysql/test/suite/binlog/t/binlog_grant.test
@@ -8089,6 +8102,7 @@ share/mysql/test/suite/binlog/t/binlog_variables_relay_log_index.test
 share/mysql/test/suite/binlog/t/binlog_write_error.test
 share/mysql/test/suite/binlog/t/binlog_xa_handling.test
 share/mysql/test/suite/binlog/t/disabled.def
+share/mysql/test/suite/binlog/t/show_binlog_events_no_lock.test
 share/mysql/test/suite/engines/README
 share/mysql/test/suite/engines/funcs/r/ai_init_alter_table.result
 share/mysql/test/suite/engines/funcs/r/ai_init_create_table.result
@@ -9380,16 +9394,20 @@ share/mysql/test/suite/funcs_2/t/memory_charset.test
 share/mysql/test/suite/funcs_2/t/myisam_charset.test
 share/mysql/test/suite/funcs_2/t/suite.opt
 share/mysql/test/suite/innodb/include/checksum_not_strict.inc
+share/mysql/test/suite/innodb/include/import.inc
 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/add_foreign_key.result
+share/mysql/test/suite/innodb/r/alter_rename_existing.result
 share/mysql/test/suite/innodb/r/blob-update-debug.result
 share/mysql/test/suite/innodb/r/blob_redo.result
 share/mysql/test/suite/innodb/r/checksum.result
 share/mysql/test/suite/innodb/r/create-index.result
+share/mysql/test/suite/innodb/r/dropdb.result
 share/mysql/test/suite/innodb/r/foreign_key.result
+share/mysql/test/suite/innodb/r/import.result
 share/mysql/test/suite/innodb/r/index_tree_operation.result
 share/mysql/test/suite/innodb/r/innodb-2byte-collation.result
 share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result
@@ -9420,6 +9438,7 @@ share/mysql/test/suite/innodb/r/innodb-index-online-purge.result
 share/mysql/test/suite/innodb/r/innodb-index-online.result
 share/mysql/test/suite/innodb/r/innodb-index.result
 share/mysql/test/suite/innodb/r/innodb-index_ucs2.result
+share/mysql/test/suite/innodb/r/innodb-lock-inherit-read_commited.result
 share/mysql/test/suite/innodb/r/innodb-lock.result
 share/mysql/test/suite/innodb/r/innodb-log-file-size-1.result
 share/mysql/test/suite/innodb/r/innodb-log-file-size.result
@@ -9449,6 +9468,7 @@ share/mysql/test/suite/innodb/r/innodb-wl6445-2.result
 share/mysql/test/suite/innodb/r/innodb-wl6445.result
 share/mysql/test/suite/innodb/r/innodb.result
 share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
+share/mysql/test/suite/innodb/r/innodb_autoinc_reset.result
 share/mysql/test/suite/innodb/r/innodb_blob_unrecoverable_crash.result
 share/mysql/test/suite/innodb/r/innodb_buffer_pool_load.result
 share/mysql/test/suite/innodb/r/innodb_bug-13628249.result
@@ -9521,6 +9541,7 @@ share/mysql/test/suite/innodb/r/innodb_bug70867.result
 share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result
 share/mysql/test/suite/innodb/r/innodb_ctype_ldml.result
 share/mysql/test/suite/innodb/r/innodb_file_format.result
+share/mysql/test/suite/innodb/r/innodb_force_recovery.result
 share/mysql/test/suite/innodb/r/innodb_gis.result
 share/mysql/test/suite/innodb/r/innodb_i_s_innodb_locks.result
 share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.result
@@ -9565,13 +9586,16 @@ share/mysql/test/suite/innodb/r/strict_checksum.result
 share/mysql/test/suite/innodb/r/strict_mode.result
 share/mysql/test/suite/innodb/r/xa_recovery.result
 share/mysql/test/suite/innodb/t/add_foreign_key.test
+share/mysql/test/suite/innodb/t/alter_rename_existing.test
 share/mysql/test/suite/innodb/t/blob-update-debug.test
 share/mysql/test/suite/innodb/t/blob_redo-master.opt
 share/mysql/test/suite/innodb/t/blob_redo.test
 share/mysql/test/suite/innodb/t/checksum.test
 share/mysql/test/suite/innodb/t/create-index.test
 share/mysql/test/suite/innodb/t/disabled.def
+share/mysql/test/suite/innodb/t/dropdb.test
 share/mysql/test/suite/innodb/t/foreign_key.test
+share/mysql/test/suite/innodb/t/import.test
 share/mysql/test/suite/innodb/t/index_tree_operation.test
 share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt
 share/mysql/test/suite/innodb/t/innodb-2byte-collation.test
@@ -9609,6 +9633,7 @@ share/mysql/test/suite/innodb/t/innodb-index-online-purge.test
 share/mysql/test/suite/innodb/t/innodb-index-online.test
 share/mysql/test/suite/innodb/t/innodb-index.test
 share/mysql/test/suite/innodb/t/innodb-index_ucs2.test
+share/mysql/test/suite/innodb/t/innodb-lock-inherit-read_commited.test
 share/mysql/test/suite/innodb/t/innodb-lock.test
 share/mysql/test/suite/innodb/t/innodb-log-file-size-1.test
 share/mysql/test/suite/innodb/t/innodb-log-file-size.test
@@ -9643,6 +9668,7 @@ share/mysql/test/suite/innodb/t/innodb-wl6445.test
 share/mysql/test/suite/innodb/t/innodb.test
 share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
+share/mysql/test/suite/innodb/t/innodb_autoinc_reset.test
 share/mysql/test/suite/innodb/t/innodb_blob_unrecoverable_crash.test
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_load-master.opt
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_load.test
@@ -9722,7 +9748,6 @@ share/mysql/test/suite/innodb/t/innodb_bug60049-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug60049.test
 share/mysql/test/suite/innodb/t/innodb_bug60196-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug60196.test
-share/mysql/test/suite/innodb/t/innodb_bug60229-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug60229.test
 share/mysql/test/suite/innodb/t/innodb_bug70867.test
 share/mysql/test/suite/innodb/t/innodb_corrupt_bit.test
@@ -9730,6 +9755,7 @@ share/mysql/test/suite/innodb/t/innodb_ctype_ldml-master.opt
 share/mysql/test/suite/innodb/t/innodb_ctype_ldml.test
 share/mysql/test/suite/innodb/t/innodb_file_format-master.opt
 share/mysql/test/suite/innodb/t/innodb_file_format.test
+share/mysql/test/suite/innodb/t/innodb_force_recovery.test
 share/mysql/test/suite/innodb/t/innodb_gis.test
 share/mysql/test/suite/innodb/t/innodb_i_s_innodb_locks.test
 share/mysql/test/suite/innodb/t/innodb_i_s_innodb_trx.test
@@ -10145,13 +10171,9 @@ share/mysql/test/suite/jp/t/jp_create_tbl_sjis.test
 share/mysql/test/suite/jp/t/jp_create_tbl_ucs2.test
 share/mysql/test/suite/jp/t/jp_create_tbl_ujis.test
 share/mysql/test/suite/jp/t/jp_create_tbl_utf8.test
-share/mysql/test/suite/jp/t/jp_enum_sjis-master.opt
 share/mysql/test/suite/jp/t/jp_enum_sjis.test
-share/mysql/test/suite/jp/t/jp_enum_ucs2-master.opt
 share/mysql/test/suite/jp/t/jp_enum_ucs2.test
-share/mysql/test/suite/jp/t/jp_enum_ujis-master.opt
 share/mysql/test/suite/jp/t/jp_enum_ujis.test
-share/mysql/test/suite/jp/t/jp_enum_utf8-master.opt
 share/mysql/test/suite/jp/t/jp_enum_utf8.test
 share/mysql/test/suite/jp/t/jp_insert_sjis.test
 share/mysql/test/suite/jp/t/jp_insert_ucs2.test
@@ -10352,6 +10374,7 @@ share/mysql/test/suite/ndb/include/ndb_error_reporter.inc
 share/mysql/test/suite/ndb/include/ndb_execute_count.inc
 share/mysql/test/suite/ndb/include/ndb_find_index_stat_tool.inc
 share/mysql/test/suite/ndb/include/ndb_find_print_file_tool.inc
+share/mysql/test/suite/ndb/include/ndb_find_tools.inc
 share/mysql/test/suite/ndb/include/ndb_get_blob_tables.inc
 share/mysql/test/suite/ndb/include/ndb_info.inc
 share/mysql/test/suite/ndb/include/ndb_init_execute_count.inc
@@ -10428,6 +10451,8 @@ share/mysql/test/suite/ndb/r/ndb_dd_initial_lg.result
 share/mysql/test/suite/ndb/r/ndb_dd_restore_compat.result
 share/mysql/test/suite/ndb/r/ndb_dd_sql_features.result
 share/mysql/test/suite/ndb/r/ndb_ddl_open_trans.result
+share/mysql/test/suite/ndb/r/ndb_desc_blob.result
+share/mysql/test/suite/ndb/r/ndb_disconnect.result
 share/mysql/test/suite/ndb/r/ndb_disconnect_ddl.result
 share/mysql/test/suite/ndb/r/ndb_discover_db.result
 share/mysql/test/suite/ndb/r/ndb_dist_priv.result
@@ -10514,6 +10539,7 @@ share/mysql/test/suite/ndb/r/ndb_restore_conv_lossy_integral.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_more.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_padding.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_promotion.result
+share/mysql/test/suite/ndb/r/ndb_restore_discover.result
 share/mysql/test/suite/ndb/r/ndb_restore_misc.result
 share/mysql/test/suite/ndb/r/ndb_restore_print.result
 share/mysql/test/suite/ndb/r/ndb_restore_schema_blobs.result
@@ -10527,6 +10553,7 @@ share/mysql/test/suite/ndb/r/ndb_row_format.result
 share/mysql/test/suite/ndb/r/ndb_select_count.result
 share/mysql/test/suite/ndb/r/ndb_share.result
 share/mysql/test/suite/ndb/r/ndb_short_sigs.result
+share/mysql/test/suite/ndb/r/ndb_show_tables.result
 share/mysql/test/suite/ndb/r/ndb_single_user.result
 share/mysql/test/suite/ndb/r/ndb_sp.result
 share/mysql/test/suite/ndb/r/ndb_spj_dict.result
@@ -10538,6 +10565,7 @@ share/mysql/test/suite/ndb/r/ndb_subquery.result
 share/mysql/test/suite/ndb/r/ndb_suma_handover.result
 share/mysql/test/suite/ndb/r/ndb_temporary.result
 share/mysql/test/suite/ndb/r/ndb_tmp_table_and_DDL.result
+share/mysql/test/suite/ndb/r/ndb_tools_connect.result
 share/mysql/test/suite/ndb/r/ndb_transaction.result
 share/mysql/test/suite/ndb/r/ndb_trigger.result
 share/mysql/test/suite/ndb/r/ndb_truncate.result
@@ -10646,6 +10674,8 @@ share/mysql/test/suite/ndb/t/ndb_dd_initial_lg.test
 share/mysql/test/suite/ndb/t/ndb_dd_restore_compat.test
 share/mysql/test/suite/ndb/t/ndb_dd_sql_features.test
 share/mysql/test/suite/ndb/t/ndb_ddl_open_trans.test
+share/mysql/test/suite/ndb/t/ndb_desc_blob.test
+share/mysql/test/suite/ndb/t/ndb_disconnect.test
 share/mysql/test/suite/ndb/t/ndb_disconnect_ddl.test
 share/mysql/test/suite/ndb/t/ndb_discover_db-master.opt
 share/mysql/test/suite/ndb/t/ndb_discover_db.test
@@ -10759,6 +10789,7 @@ share/mysql/test/suite/ndb/t/ndb_restore_conv_lossy_integral.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_more.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_padding.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_promotion.test
+share/mysql/test/suite/ndb/t/ndb_restore_discover.test
 share/mysql/test/suite/ndb/t/ndb_restore_misc.cnf
 share/mysql/test/suite/ndb/t/ndb_restore_misc.test
 share/mysql/test/suite/ndb/t/ndb_restore_print.test
@@ -10777,6 +10808,7 @@ share/mysql/test/suite/ndb/t/ndb_share.cnf
 share/mysql/test/suite/ndb/t/ndb_share.test
 share/mysql/test/suite/ndb/t/ndb_short_sigs.cnf
 share/mysql/test/suite/ndb/t/ndb_short_sigs.test
+share/mysql/test/suite/ndb/t/ndb_show_tables.test
 share/mysql/test/suite/ndb/t/ndb_show_tables_result.inc
 share/mysql/test/suite/ndb/t/ndb_single_user-master.opt
 share/mysql/test/suite/ndb/t/ndb_single_user.test
@@ -10792,6 +10824,7 @@ share/mysql/test/suite/ndb/t/ndb_suma_handover.cnf
 share/mysql/test/suite/ndb/t/ndb_suma_handover.test
 share/mysql/test/suite/ndb/t/ndb_temporary.test
 share/mysql/test/suite/ndb/t/ndb_tmp_table_and_DDL.test
+share/mysql/test/suite/ndb/t/ndb_tools_connect.test
 share/mysql/test/suite/ndb/t/ndb_transaction.test
 share/mysql/test/suite/ndb/t/ndb_trigger.test
 share/mysql/test/suite/ndb/t/ndb_truncate.test
@@ -10875,12 +10908,14 @@ share/mysql/test/suite/ndb_binlog/r/ndb_binlog_log_transaction_id.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_manual_apply.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_multi.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_purge.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_restart.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_restore.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_size_based_rotate.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_temporals_new.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_temporals_old.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_test_conflict_flags.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_unique_epoch.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_variant_ddl.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_variants.result
 share/mysql/test/suite/ndb_binlog/t/disabled.def
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_basic.test
@@ -10916,7 +10951,8 @@ share/mysql/test/suite/ndb_binlog/t/ndb_binlog_manual_apply.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_multi.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_purge-master.opt
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_purge.test
-share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restore-master.opt
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restart.cnf
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restart.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restore.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_size_based_rotate.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals.inc
@@ -10926,6 +10962,8 @@ share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals_old.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_test_conflict_flags.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.cnf
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.test
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_variant_ddl.cnf
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_variant_ddl.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_variants.cnf
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_variants.test
 share/mysql/test/suite/ndb_memcache/include/datatypes_tables.inc
@@ -12580,6 +12618,7 @@ 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_corruption.result
 share/mysql/test/suite/rpl/r/rpl_crash_safe_master.result
+share/mysql/test/suite/rpl/r/rpl_crc_check.result
 share/mysql/test/suite/rpl/r/rpl_create_database.result
 share/mysql/test/suite/rpl/r/rpl_create_drop_temp_table.result
 share/mysql/test/suite/rpl/r/rpl_create_if_not_exists.result
@@ -12603,7 +12642,9 @@ share/mysql/test/suite/rpl/r/rpl_drop_temp.result
 share/mysql/test/suite/rpl/r/rpl_drop_temp_gtid.result
 share/mysql/test/suite/rpl/r/rpl_drop_view.result
 share/mysql/test/suite/rpl/r/rpl_dual_pos_advance.result
+share/mysql/test/suite/rpl/r/rpl_dump_thread_kill.result
 share/mysql/test/suite/rpl/r/rpl_empty_master_host.result
+share/mysql/test/suite/rpl/r/rpl_empty_multi_update.result
 share/mysql/test/suite/rpl/r/rpl_err_ignoredtable.result
 share/mysql/test/suite/rpl/r/rpl_events.result
 share/mysql/test/suite/rpl/r/rpl_extra_col_master_innodb.result
@@ -12620,6 +12661,7 @@ share/mysql/test/suite/rpl/r/rpl_flushlog_loop.result
 share/mysql/test/suite/rpl/r/rpl_foreign_key_innodb.result
 share/mysql/test/suite/rpl/r/rpl_free_items.result
 share/mysql/test/suite/rpl/r/rpl_function_defaults.result
+share/mysql/test/suite/rpl/r/rpl_gap_in_retrieved_gtid_set.result
 share/mysql/test/suite/rpl/r/rpl_general_log.result
 share/mysql/test/suite/rpl/r/rpl_geometry.result
 share/mysql/test/suite/rpl/r/rpl_get_lock.result
@@ -12642,6 +12684,7 @@ 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_mode_off_new_master.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode_on_new_master.result
+share/mysql/test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.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
@@ -12653,6 +12696,7 @@ 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_gtid_transaction_split_across_relay_logs.result
 share/mysql/test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
 share/mysql/test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result
 share/mysql/test/suite/rpl/r/rpl_heartbeat.result
@@ -12722,6 +12766,7 @@ share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.resul
 share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
 share/mysql/test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result
 share/mysql/test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
+share/mysql/test/suite/rpl/r/rpl_mts_stop_slave.result
 share/mysql/test/suite/rpl/r/rpl_multi_delete.result
 share/mysql/test/suite/rpl/r/rpl_multi_delete2.result
 share/mysql/test/suite/rpl/r/rpl_multi_engine.result
@@ -12766,6 +12811,7 @@ 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_recovery_empty_sqlthd_pos.result
 share/mysql/test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result
+share/mysql/test/suite/rpl/r/rpl_relay_log_recovery_positions.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_relayrotate.result
@@ -12845,6 +12891,7 @@ share/mysql/test/suite/rpl/r/rpl_row_rec_comp_innodb.result
 share/mysql/test/suite/rpl/r/rpl_row_rec_comp_myisam.result
 share/mysql/test/suite/rpl/r/rpl_row_record_find_myisam.result
 share/mysql/test/suite/rpl/r/rpl_row_reset_slave.result
+share/mysql/test/suite/rpl/r/rpl_row_rollback_to_savepoint.result
 share/mysql/test/suite/rpl/r/rpl_row_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_row_sp001.result
 share/mysql/test/suite/rpl/r/rpl_row_sp002_innodb.result
@@ -12926,6 +12973,7 @@ share/mysql/test/suite/rpl/r/rpl_stm_conflicts.result
 share/mysql/test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
 share/mysql/test/suite/rpl/r/rpl_stm_flsh_tbls.result
 share/mysql/test/suite/rpl/r/rpl_stm_found_rows.result
+share/mysql/test/suite/rpl/r/rpl_stm_ignore.result
 share/mysql/test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
 share/mysql/test/suite/rpl/r/rpl_stm_innodb.result
 share/mysql/test/suite/rpl/r/rpl_stm_insert_delayed.result
@@ -12935,6 +12983,7 @@ share/mysql/test/suite/rpl/r/rpl_stm_loadfile.result
 share/mysql/test/suite/rpl/r/rpl_stm_log.result
 share/mysql/test/suite/rpl/r/rpl_stm_max_relay_size.result
 share/mysql/test/suite/rpl/r/rpl_stm_mix_mts_show_relaylog_events.result
+share/mysql/test/suite/rpl/r/rpl_stm_mix_rollback_to_savepoint.result
 share/mysql/test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
 share/mysql/test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result
@@ -12959,6 +13008,7 @@ share/mysql/test/suite/rpl/r/rpl_temp_table.result
 share/mysql/test/suite/rpl/r/rpl_temp_table_mix_row.result
 share/mysql/test/suite/rpl/r/rpl_temporal_fractional.result
 share/mysql/test/suite/rpl/r/rpl_temporary.result
+share/mysql/test/suite/rpl/r/rpl_temporary_error_table_repository.result
 share/mysql/test/suite/rpl/r/rpl_temporary_errors.result
 share/mysql/test/suite/rpl/r/rpl_test_framework.result
 share/mysql/test/suite/rpl/r/rpl_timestamp_upgrage_55.result
@@ -13047,6 +13097,8 @@ 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
 share/mysql/test/suite/rpl/t/rpl_crash_safe_master.test
+share/mysql/test/suite/rpl/t/rpl_crc_check-master.opt
+share/mysql/test/suite/rpl/t/rpl_crc_check.test
 share/mysql/test/suite/rpl/t/rpl_create_database-master.opt
 share/mysql/test/suite/rpl/t/rpl_create_database-slave.opt
 share/mysql/test/suite/rpl/t/rpl_create_database.test
@@ -13070,7 +13122,6 @@ share/mysql/test/suite/rpl/t/rpl_do_grant.test
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_insensitive-master.opt
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_insensitive-slave.opt
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_insensitive.test
-share/mysql/test/suite/rpl/t/rpl_do_table_filter_sensitive-master.opt
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_sensitive-slave.opt
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_sensitive.test
 share/mysql/test/suite/rpl/t/rpl_drop.test
@@ -13082,7 +13133,9 @@ share/mysql/test/suite/rpl/t/rpl_drop_temp_gtid.test
 share/mysql/test/suite/rpl/t/rpl_drop_view.test
 share/mysql/test/suite/rpl/t/rpl_dual_pos_advance-master.opt
 share/mysql/test/suite/rpl/t/rpl_dual_pos_advance.test
+share/mysql/test/suite/rpl/t/rpl_dump_thread_kill.test
 share/mysql/test/suite/rpl/t/rpl_empty_master_host.test
+share/mysql/test/suite/rpl/t/rpl_empty_multi_update.test
 share/mysql/test/suite/rpl/t/rpl_err_ignoredtable-slave.opt
 share/mysql/test/suite/rpl/t/rpl_err_ignoredtable.test
 share/mysql/test/suite/rpl/t/rpl_events.test
@@ -13109,6 +13162,7 @@ share/mysql/test/suite/rpl/t/rpl_foreign_key_innodb.test
 share/mysql/test/suite/rpl/t/rpl_free_items-slave.opt
 share/mysql/test/suite/rpl/t/rpl_free_items.test
 share/mysql/test/suite/rpl/t/rpl_function_defaults.test
+share/mysql/test/suite/rpl/t/rpl_gap_in_retrieved_gtid_set.test
 share/mysql/test/suite/rpl/t/rpl_general_log.test
 share/mysql/test/suite/rpl/t/rpl_geometry.test
 share/mysql/test/suite/rpl/t/rpl_get_lock.test
@@ -13125,7 +13179,6 @@ 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_drop_table.cnf
@@ -13142,7 +13195,6 @@ 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
@@ -13150,6 +13202,9 @@ 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_mode_off_new_master.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode_on_new_master.test
+share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.test
 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
@@ -13166,6 +13221,8 @@ 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_gtid_transaction_split_across_relay_logs.cnf
+share/mysql/test/suite/rpl/t/rpl_gtid_transaction_split_across_relay_logs.test
 share/mysql/test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
 share/mysql/test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test
 share/mysql/test/suite/rpl/t/rpl_heartbeat-master.opt
@@ -13188,7 +13245,6 @@ share/mysql/test/suite/rpl/t/rpl_ignore_table.test
 share/mysql/test/suite/rpl/t/rpl_ignore_table_filter_insensitive-master.opt
 share/mysql/test/suite/rpl/t/rpl_ignore_table_filter_insensitive-slave.opt
 share/mysql/test/suite/rpl/t/rpl_ignore_table_filter_insensitive.test
-share/mysql/test/suite/rpl/t/rpl_ignore_table_filter_sensitive-master.opt
 share/mysql/test/suite/rpl/t/rpl_ignore_table_filter_sensitive-slave.opt
 share/mysql/test/suite/rpl/t/rpl_ignore_table_filter_sensitive.test
 share/mysql/test/suite/rpl/t/rpl_ignore_table_update-slave.opt
@@ -13286,6 +13342,8 @@ share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
 share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
+share/mysql/test/suite/rpl/t/rpl_mts_stop_slave-slave.opt
+share/mysql/test/suite/rpl/t/rpl_mts_stop_slave.test
 share/mysql/test/suite/rpl/t/rpl_multi_delete-slave.opt
 share/mysql/test/suite/rpl/t/rpl_multi_delete.test
 share/mysql/test/suite/rpl/t/rpl_multi_delete2-slave.opt
@@ -13355,6 +13413,7 @@ share/mysql/test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt
 share/mysql/test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test
 share/mysql/test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt
 share/mysql/test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test
+share/mysql/test/suite/rpl/t/rpl_relay_log_recovery_positions.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_relayrotate-slave.opt
@@ -13471,6 +13530,7 @@ share/mysql/test/suite/rpl/t/rpl_row_rec_comp_innodb.test
 share/mysql/test/suite/rpl/t/rpl_row_rec_comp_myisam.test
 share/mysql/test/suite/rpl/t/rpl_row_record_find_myisam.test
 share/mysql/test/suite/rpl/t/rpl_row_reset_slave.test
+share/mysql/test/suite/rpl/t/rpl_row_rollback_to_savepoint.test
 share/mysql/test/suite/rpl/t/rpl_row_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_row_sp001.test
 share/mysql/test/suite/rpl/t/rpl_row_sp002_innodb.test
@@ -13596,6 +13656,8 @@ share/mysql/test/suite/rpl/t/rpl_stm_conflicts.test
 share/mysql/test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
 share/mysql/test/suite/rpl/t/rpl_stm_flsh_tbls.test
 share/mysql/test/suite/rpl/t/rpl_stm_found_rows.test
+share/mysql/test/suite/rpl/t/rpl_stm_ignore-slave.opt
+share/mysql/test/suite/rpl/t/rpl_stm_ignore.test
 share/mysql/test/suite/rpl/t/rpl_stm_implicit_commit_binlog-master.opt
 share/mysql/test/suite/rpl/t/rpl_stm_implicit_commit_binlog-slave.opt
 share/mysql/test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
@@ -13610,6 +13672,7 @@ share/mysql/test/suite/rpl/t/rpl_stm_log-slave.opt
 share/mysql/test/suite/rpl/t/rpl_stm_log.test
 share/mysql/test/suite/rpl/t/rpl_stm_max_relay_size.test
 share/mysql/test/suite/rpl/t/rpl_stm_mix_mts_show_relaylog_events.test
+share/mysql/test/suite/rpl/t/rpl_stm_mix_rollback_to_savepoint.test
 share/mysql/test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_stm_mixed_crash_safe-slave.opt
 share/mysql/test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
@@ -13644,6 +13707,7 @@ share/mysql/test/suite/rpl/t/rpl_temp_table.test
 share/mysql/test/suite/rpl/t/rpl_temp_table_mix_row.test
 share/mysql/test/suite/rpl/t/rpl_temporal_fractional.test
 share/mysql/test/suite/rpl/t/rpl_temporary.test
+share/mysql/test/suite/rpl/t/rpl_temporary_error_table_repository.test
 share/mysql/test/suite/rpl/t/rpl_temporary_errors-slave.opt
 share/mysql/test/suite/rpl/t/rpl_temporary_errors.test
 share/mysql/test/suite/rpl/t/rpl_test_framework.cnf
@@ -13991,6 +14055,7 @@ share/mysql/test/suite/sys_vars/r/innodb_monitor_disable_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_monitor_enable_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_monitor_reset_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_numa_interleave_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_old_blocks_pct_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_old_blocks_time_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_online_alter_log_max_size_basic.result
@@ -14179,6 +14244,7 @@ share/mysql/test/suite/sys_vars/r/pfs_events_waits_hl_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_hosts_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_cond_classes_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_cond_instances_basic.result
+share/mysql/test/suite/sys_vars/r/pfs_max_digest_length_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_file_classes_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_file_handles_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_file_instances_basic.result
@@ -14603,6 +14669,7 @@ share/mysql/test/suite/sys_vars/t/innodb_monitor_disable_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_monitor_enable_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_monitor_reset_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_numa_interleave_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_old_blocks_pct_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_old_blocks_time_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_online_alter_log_max_size_basic.test
@@ -14810,6 +14877,8 @@ share/mysql/test/suite/sys_vars/t/pfs_max_cond_classes_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_max_cond_classes_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_max_cond_instances_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_max_cond_instances_basic.test
+share/mysql/test/suite/sys_vars/t/pfs_max_digest_length_basic-master.opt
+share/mysql/test/suite/sys_vars/t/pfs_max_digest_length_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_max_file_classes_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_max_file_classes_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_max_file_handles_basic-master.opt
@@ -15207,6 +15276,8 @@ share/mysql/test/t/drop_debug.test
 share/mysql/test/t/ds_mrr-big.test
 share/mysql/test/t/dynamic_tracing.test
 share/mysql/test/t/empty_table.test
+share/mysql/test/t/enable_cleartext_plugin-master.opt
+share/mysql/test/t/enable_cleartext_plugin.test
 share/mysql/test/t/endspace.test
 share/mysql/test/t/eq_range_idx_stat.test
 share/mysql/test/t/error_simulation.test
@@ -15296,6 +15367,8 @@ share/mysql/test/t/func_rollback.test
 share/mysql/test/t/func_sapdb.test
 share/mysql/test/t/func_set.test
 share/mysql/test/t/func_str.test
+share/mysql/test/t/func_str_debug.test
+share/mysql/test/t/func_str_no_ps.test
 share/mysql/test/t/func_system.test
 share/mysql/test/t/func_test.test
 share/mysql/test/t/func_time.test
@@ -15447,6 +15520,7 @@ share/mysql/test/t/long_tmpdir-master.opt
 share/mysql/test/t/long_tmpdir-master.sh
 share/mysql/test/t/long_tmpdir.test
 share/mysql/test/t/lowercase_fs_off.test
+share/mysql/test/t/lowercase_fs_on.test
 share/mysql/test/t/lowercase_mixed_tmpdir-master.opt
 share/mysql/test/t/lowercase_mixed_tmpdir-master.sh
 share/mysql/test/t/lowercase_mixed_tmpdir.test
@@ -15456,8 +15530,6 @@ share/mysql/test/t/lowercase_mixed_tmpdir_innodb.test
 share/mysql/test/t/lowercase_table-master.opt
 share/mysql/test/t/lowercase_table.test
 share/mysql/test/t/lowercase_table2.test
-share/mysql/test/t/lowercase_table3-master.opt
-share/mysql/test/t/lowercase_table3.test
 share/mysql/test/t/lowercase_table4-master.opt
 share/mysql/test/t/lowercase_table4.test
 share/mysql/test/t/lowercase_table_grant-master.opt
@@ -15476,8 +15548,6 @@ share/mysql/test/t/merge.test
 share/mysql/test/t/merge_innodb.test
 share/mysql/test/t/merge_mmap-master.opt
 share/mysql/test/t/merge_mmap.test
-share/mysql/test/t/merge_recover-master.opt
-share/mysql/test/t/merge_recover.test
 share/mysql/test/t/metadata.test
 share/mysql/test/t/mix2_myisam-master.opt
 share/mysql/test/t/mix2_myisam.test
@@ -15518,6 +15588,8 @@ share/mysql/test/t/myisam_mrr_cost_all.test
 share/mysql/test/t/myisam_mrr_cost_icp.test
 share/mysql/test/t/myisam_mrr_icp.test
 share/mysql/test/t/myisam_mrr_none.test
+share/mysql/test/t/myisam_recover-master.opt
+share/mysql/test/t/myisam_recover.test
 share/mysql/test/t/myisam_row_rpl-master.opt
 share/mysql/test/t/myisam_row_rpl-slave.opt
 share/mysql/test/t/myisam_row_rpl.test
@@ -15834,6 +15906,7 @@ share/mysql/test/t/status-master.opt
 share/mysql/test/t/status.test
 share/mysql/test/t/status2.test
 share/mysql/test/t/status_bug17954.test
+share/mysql/test/t/status_debug.test
 share/mysql/test/t/strict-master.opt
 share/mysql/test/t/strict.test
 share/mysql/test/t/strict_autoinc_1myisam.test
diff --git a/databases/mysql-cluster/distinfo b/databases/mysql-cluster/distinfo
index aca5131c164..5f25c9fa8bf 100644
--- a/databases/mysql-cluster/distinfo
+++ b/databases/mysql-cluster/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 01:56:15 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/03/09 21:51:45 fhajny Exp $
 
-SHA1 (mysql-cluster-gpl-7.4.7.tar.gz) = be4d697eae16c1c75b287a07cf758f9e3bd00e0f
-RMD160 (mysql-cluster-gpl-7.4.7.tar.gz) = bc36b6758ca1bb4ccfd026ffc0abf630fb5f2d1e
-SHA512 (mysql-cluster-gpl-7.4.7.tar.gz) = 5009e8ed0786a65e8223275c8521b236d3092e5fcfbfab91a29ad13e6890a39482980912c13c9836d1768c6926d27ae8b263338117e56ff586d51eb0c7a8e2ec
-Size (mysql-cluster-gpl-7.4.7.tar.gz) = 42943769 bytes
+SHA1 (mysql-cluster-gpl-7.4.10.tar.gz) = 2317a8e63b15ae53a0528d05f7228bd7c7e6eaef
+RMD160 (mysql-cluster-gpl-7.4.10.tar.gz) = 2b66e3943cfc22da5b05326efd63aaef09ff4465
+SHA512 (mysql-cluster-gpl-7.4.10.tar.gz) = d445c87a2061ef70f09aaf76c01c36f1f3f5479295407165bb6ee5544b9fca671481078eadff62286c2043183d60ff1f7191fa34f5761e59404facc5f86a5e09
+Size (mysql-cluster-gpl-7.4.10.tar.gz) = 41712679 bytes
 SHA1 (patch-CMakeLists.txt) = fabc427d8e7974cb8af1ce057f994b1436628443
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93