Changes 5.6.16:

Functionality Added or Changed
* InnoDB: New global configuration parameters, innodb_status_output and innodb_status_output_locks, allow you to dynamically enable and disable the standard InnoDB Monitor and InnoDB Lock Monitor for periodic output. Enabling and disabling monitors for periodic output by creating and dropping specially named tables is deprecated and may be removed in a future release.
* Previously, ALTER TABLE in MySQL 5.6 could alter a table such that the result had temporal columns in both 5.5 and 5.6 format. Now ALTER TABLE upgrades old temporal columns to 5.6 format for ADD COLUMN, CHANGE COLUMN, MODIFY COLUMN, ADD INDEX, and FORCE operations. This conversion cannot be done using the INPLACE algorithm, so specifying ALGORITHM=INPLACE in these cases results in an error.
* CMake now supports a -DTMPDIR=dir_name option to specify the default tmpdir value. If unspecified, the value defaults to P_tmpdir in <stdio.h>.

Bugs Fixed
* InnoDB; Replication: Using the InnoDB memcached plugin (see InnoDB Integration with memcached) with innodb_api_enable_binlog set to 1 caused the server to leak memory.
* InnoDB: A boolean mode full-text search query would result in a memory access violation during parsing.
* InnoDB: When new indexes are added by an ALTER TABLE operation, instead of only saving table-level statistics and statistics for the new indexes, InnoDB would save statistics for the entire table, including the table's other indexes. This behavior slowed ALTER TABLE performance.
* InnoDB: Due to a parser error, full-text search queries that include a sub-expression could return the wrong result.
* InnoDB: The innochecksum tool did not use a Windows-specific API to retrieve file size information, which resulted in an incorrect error message (Error: ibdata1 cannot be found) when the MySQL 5.6 innochecksum 2GB file size limit was exceeded. innochecksum now provides support for files larger than 2GB in both MySQL 5.6 and MySQL 5.7.
* InnoDB: Due to a regression introduced by the fix for Bug17371537, memory was not allocated for the default memcached engine when using the default memcached engine as the backstore for data instead of InnoDB.
* InnoDB: InnoDB would report an incorrect operating system error code after failing to initialize.
* InnoDB: Manipulating a table after discarding its tablespace using ALTER TABLE ... DISCARD TABLESPACE could result in a serious error.
* InnoDB: Persistent optimizer statistics would cause stalls due to latch contention.
* InnoDB: MATCH() ... AGAINST queries that use a long string as an argument for AGAINST() could result in an error when run on an InnoDB table with a full-text search index.
* InnoDB: An InnoDB full-text search failure would occur due to an “unended” token. The string and string length should be passed for string comparison.
* InnoDB: In debug builds, a merge insert buffer during a page read would cause a memory access violation.
* InnoDB: Truncating a memcached InnoDB table while memcached is performing DML operations would result in a serious error.
* InnoDB: In sync0rw.ic, rw_lock_x_lock_func_nowait would needlessly call os_thread_get_curr_id.
* InnoDB: Attempting to rename a table to a missing database would result in a serious error.
more...

2 files changed, 63 insertions, 50 deletions

diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index d6aacf94ba4..11b069d43f5 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2014/02/12 23:17:39 tron Exp $
+# $NetBSD: Makefile,v 1.13 2014/02/13 07:49:56 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqs
 COMMENT=	MySQL 5, a free SQL database (server)
 
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index 6b26ec4eb89..ac57bef4082 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2013/12/03 20:02:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/02/13 07:49:56 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -537,6 +537,7 @@ share/mysql/test/include/linux_sys_vars.inc
 share/mysql/test/include/load_sysvars.inc
 share/mysql/test/include/loaddata_autocom.inc
 share/mysql/test/include/master-slave.inc
+share/mysql/test/include/memcache_config.inc
 share/mysql/test/include/min_null_cond.inc
 share/mysql/test/include/mix1.inc
 share/mysql/test/include/mix2.inc
@@ -655,6 +656,7 @@ share/mysql/test/include/running_event_scheduler.inc
 share/mysql/test/include/safe_set_to_maybe_ro_var.inc
 share/mysql/test/include/save_io_thread_pos.inc
 share/mysql/test/include/save_master_pos.inc
+share/mysql/test/include/search_pattern.inc
 share/mysql/test/include/search_pattern_in_file.inc
 share/mysql/test/include/select.inc
 share/mysql/test/include/set_binlog_format_mixed.sql
@@ -3336,13 +3338,8 @@ share/mysql/test/suite/funcs_2/t/innodb_charset.test
 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/innodb_create_tab_indx.inc
 share/mysql/test/suite/innodb/include/innodb_dict.inc
-share/mysql/test/suite/innodb/include/innodb_fetch_records.inc
-share/mysql/test/suite/innodb/include/innodb_load_data.inc
 share/mysql/test/suite/innodb/include/innodb_stats.inc
-share/mysql/test/suite/innodb/include/innodb_stats_comp_index.inc
-share/mysql/test/suite/innodb/include/innodb_stats_restart.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/innodb-2byte-collation.result
@@ -3363,8 +3360,8 @@ share/mysql/test/suite/innodb/r/innodb-bug-14068765.result
 share/mysql/test/suite/innodb/r/innodb-bug-14084530.result
 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-create-options.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
@@ -3378,8 +3375,8 @@ share/mysql/test/suite/innodb/r/innodb-log-file-size.result
 share/mysql/test/suite/innodb/r/innodb-multiple-tablespaces.result
 share/mysql/test/suite/innodb/r/innodb-read-view.result
 share/mysql/test/suite/innodb/r/innodb-replace.result
-share/mysql/test/suite/innodb/r/innodb-restart.result
 share/mysql/test/suite/innodb/r/innodb-semi-consistent.result
+share/mysql/test/suite/innodb/r/innodb-status-output.result
 share/mysql/test/suite/innodb/r/innodb-system-table-view.result
 share/mysql/test/suite/innodb/r/innodb-table-online.result
 share/mysql/test/suite/innodb/r/innodb-tablespace.result
@@ -3388,9 +3385,7 @@ 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-use-sys-malloc.result
 share/mysql/test/suite/innodb/r/innodb-wl5522-1.result
-share/mysql/test/suite/innodb/r/innodb-wl5522-debug-zip.result
 share/mysql/test/suite/innodb/r/innodb-wl5522-debug.result
-share/mysql/test/suite/innodb/r/innodb-wl5522-zip.result
 share/mysql/test/suite/innodb/r/innodb-wl5522.result
 share/mysql/test/suite/innodb/r/innodb-wl5980-alter.result
 share/mysql/test/suite/innodb/r/innodb-wl5980-debug.result
@@ -3400,11 +3395,7 @@ share/mysql/test/suite/innodb/r/innodb-wl5980-windows.result
 share/mysql/test/suite/innodb/r/innodb-wl6445-1.result
 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-zip.result
 share/mysql/test/suite/innodb/r/innodb.result
-share/mysql/test/suite/innodb/r/innodb_16k.result
-share/mysql/test/suite/innodb/r/innodb_4k.result
-share/mysql/test/suite/innodb/r/innodb_8k.result
 share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
 share/mysql/test/suite/innodb/r/innodb_buffer_pool_load.result
 share/mysql/test/suite/innodb/r/innodb_bug-13628249.result
@@ -3430,8 +3421,6 @@ share/mysql/test/suite/innodb/r/innodb_bug30919.result
 share/mysql/test/suite/innodb/r/innodb_bug34053.result
 share/mysql/test/suite/innodb/r/innodb_bug34300.result
 share/mysql/test/suite/innodb/r/innodb_bug35220.result
-share/mysql/test/suite/innodb/r/innodb_bug36169.result
-share/mysql/test/suite/innodb/r/innodb_bug36172.result
 share/mysql/test/suite/innodb/r/innodb_bug38231.result
 share/mysql/test/suite/innodb/r/innodb_bug39438.result
 share/mysql/test/suite/innodb/r/innodb_bug40360.result
@@ -3456,16 +3445,13 @@ share/mysql/test/suite/innodb/r/innodb_bug51378.result
 share/mysql/test/suite/innodb/r/innodb_bug51920.result
 share/mysql/test/suite/innodb/r/innodb_bug52199.result
 share/mysql/test/suite/innodb/r/innodb_bug52663.result
-share/mysql/test/suite/innodb/r/innodb_bug52745.result
 share/mysql/test/suite/innodb/r/innodb_bug53046.result
 share/mysql/test/suite/innodb/r/innodb_bug53290.result
-share/mysql/test/suite/innodb/r/innodb_bug53591.result
 share/mysql/test/suite/innodb/r/innodb_bug53592.result
 share/mysql/test/suite/innodb/r/innodb_bug53674.result
 share/mysql/test/suite/innodb/r/innodb_bug53756.result
 share/mysql/test/suite/innodb/r/innodb_bug54044.result
 share/mysql/test/suite/innodb/r/innodb_bug56143.result
-share/mysql/test/suite/innodb/r/innodb_bug56680.result
 share/mysql/test/suite/innodb/r/innodb_bug56716.result
 share/mysql/test/suite/innodb/r/innodb_bug56947.result
 share/mysql/test/suite/innodb/r/innodb_bug57252.result
@@ -3478,17 +3464,13 @@ share/mysql/test/suite/innodb/r/innodb_bug59733.result
 share/mysql/test/suite/innodb/r/innodb_bug60049.result
 share/mysql/test/suite/innodb/r/innodb_bug60196.result
 share/mysql/test/suite/innodb/r/innodb_bug60229.result
-share/mysql/test/suite/innodb/r/innodb_cmp_drop_table.result
-share/mysql/test/suite/innodb/r/innodb_cmp_per_index.result
+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_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
-share/mysql/test/suite/innodb/r/innodb_index_large_prefix.result
-share/mysql/test/suite/innodb/r/innodb_index_large_prefix_4k.result
-share/mysql/test/suite/innodb/r/innodb_index_large_prefix_8k.result
 share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result
 share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
 share/mysql/test/suite/innodb/r/innodb_misc1.result
@@ -3498,7 +3480,6 @@ share/mysql/test/suite/innodb/r/innodb_mysql.result
 share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result
 share/mysql/test/suite/innodb/r/innodb_notembedded.result
 share/mysql/test/suite/innodb/r/innodb_page_size_func.result
-share/mysql/test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
 share/mysql/test/suite/innodb/r/innodb_prefix_index_restart_server.result
 share/mysql/test/suite/innodb/r/innodb_replace.result
 share/mysql/test/suite/innodb/r/innodb_stats.result
@@ -3523,7 +3504,6 @@ 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/r/innodb_wl6347_comp_indx_stat.result
 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
@@ -3547,9 +3527,10 @@ share/mysql/test/suite/innodb/t/innodb-bug-14068765.test
 share/mysql/test/suite/innodb/t/innodb-bug-14084530.test
 share/mysql/test/suite/innodb/t/innodb-bug12552164.test
 share/mysql/test/suite/innodb/t/innodb-bug14219515.test
+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-create-options.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
@@ -3565,9 +3546,9 @@ share/mysql/test/suite/innodb/t/innodb-master.opt
 share/mysql/test/suite/innodb/t/innodb-multiple-tablespaces.test
 share/mysql/test/suite/innodb/t/innodb-read-view.test
 share/mysql/test/suite/innodb/t/innodb-replace.test
-share/mysql/test/suite/innodb/t/innodb-restart.test
 share/mysql/test/suite/innodb/t/innodb-semi-consistent-master.opt
 share/mysql/test/suite/innodb/t/innodb-semi-consistent.test
+share/mysql/test/suite/innodb/t/innodb-status-output.test
 share/mysql/test/suite/innodb/t/innodb-system-table-view.test
 share/mysql/test/suite/innodb/t/innodb-table-online-master.opt
 share/mysql/test/suite/innodb/t/innodb-table-online.test
@@ -3578,9 +3559,7 @@ share/mysql/test/suite/innodb/t/innodb-ucs2.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
-share/mysql/test/suite/innodb/t/innodb-wl5522-debug-zip.test
 share/mysql/test/suite/innodb/t/innodb-wl5522-debug.test
-share/mysql/test/suite/innodb/t/innodb-wl5522-zip.test
 share/mysql/test/suite/innodb/t/innodb-wl5522.test
 share/mysql/test/suite/innodb/t/innodb-wl5980-alter.test
 share/mysql/test/suite/innodb/t/innodb-wl5980-debug.test
@@ -3590,11 +3569,7 @@ share/mysql/test/suite/innodb/t/innodb-wl5980-windows.test
 share/mysql/test/suite/innodb/t/innodb-wl6445-1.test
 share/mysql/test/suite/innodb/t/innodb-wl6445-2.test
 share/mysql/test/suite/innodb/t/innodb-wl6445.test
-share/mysql/test/suite/innodb/t/innodb-zip.test
 share/mysql/test/suite/innodb/t/innodb.test
-share/mysql/test/suite/innodb/t/innodb_16k.test
-share/mysql/test/suite/innodb/t/innodb_4k.test
-share/mysql/test/suite/innodb/t/innodb_8k.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_buffer_pool_load-master.opt
@@ -3626,8 +3601,6 @@ share/mysql/test/suite/innodb/t/innodb_bug30919.test
 share/mysql/test/suite/innodb/t/innodb_bug34053.test
 share/mysql/test/suite/innodb/t/innodb_bug34300.test
 share/mysql/test/suite/innodb/t/innodb_bug35220.test
-share/mysql/test/suite/innodb/t/innodb_bug36169.test
-share/mysql/test/suite/innodb/t/innodb_bug36172.test
 share/mysql/test/suite/innodb/t/innodb_bug38231.test
 share/mysql/test/suite/innodb/t/innodb_bug39438-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug39438.test
@@ -3655,10 +3628,8 @@ share/mysql/test/suite/innodb/t/innodb_bug51378.test
 share/mysql/test/suite/innodb/t/innodb_bug51920.test
 share/mysql/test/suite/innodb/t/innodb_bug52199.test
 share/mysql/test/suite/innodb/t/innodb_bug52663.test
-share/mysql/test/suite/innodb/t/innodb_bug52745.test
 share/mysql/test/suite/innodb/t/innodb_bug53046.test
 share/mysql/test/suite/innodb/t/innodb_bug53290.test
-share/mysql/test/suite/innodb/t/innodb_bug53591.test
 share/mysql/test/suite/innodb/t/innodb_bug53592.test
 share/mysql/test/suite/innodb/t/innodb_bug53674-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug53674.test
@@ -3666,7 +3637,6 @@ share/mysql/test/suite/innodb/t/innodb_bug53756-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug53756.test
 share/mysql/test/suite/innodb/t/innodb_bug54044.test
 share/mysql/test/suite/innodb/t/innodb_bug56143.test
-share/mysql/test/suite/innodb/t/innodb_bug56680.test
 share/mysql/test/suite/innodb/t/innodb_bug56716.test
 share/mysql/test/suite/innodb/t/innodb_bug56947.test
 share/mysql/test/suite/innodb/t/innodb_bug57252.test
@@ -3682,9 +3652,7 @@ 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_cmp_drop_table-master.opt
-share/mysql/test/suite/innodb/t/innodb_cmp_drop_table.test
-share/mysql/test/suite/innodb/t/innodb_cmp_per_index.test
+share/mysql/test/suite/innodb/t/innodb_bug70867.test
 share/mysql/test/suite/innodb/t/innodb_corrupt_bit.test
 share/mysql/test/suite/innodb/t/innodb_ctype_ldml-master.opt
 share/mysql/test/suite/innodb/t/innodb_ctype_ldml.test
@@ -3693,9 +3661,6 @@ share/mysql/test/suite/innodb/t/innodb_file_format.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
-share/mysql/test/suite/innodb/t/innodb_index_large_prefix.test
-share/mysql/test/suite/innodb/t/innodb_index_large_prefix_4k.test
-share/mysql/test/suite/innodb/t/innodb_index_large_prefix_8k.test
 share/mysql/test/suite/innodb/t/innodb_information_schema_buffer.test
 share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
 share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test
@@ -3709,7 +3674,6 @@ share/mysql/test/suite/innodb/t/innodb_mysql_rbk-master.opt
 share/mysql/test/suite/innodb/t/innodb_mysql_rbk.test
 share/mysql/test/suite/innodb/t/innodb_notembedded.test
 share/mysql/test/suite/innodb/t/innodb_page_size_func.test
-share/mysql/test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
 share/mysql/test/suite/innodb/t/innodb_prefix_index_restart_server.test
 share/mysql/test/suite/innodb/t/innodb_replace.test
 share/mysql/test/suite/innodb/t/innodb_stats.test
@@ -3737,7 +3701,6 @@ share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test
 share/mysql/test/suite/innodb/t/innodb_trx_weight.test
 share/mysql/test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test
 share/mysql/test/suite/innodb/t/innodb_ut_format_name.test
-share/mysql/test/suite/innodb/t/innodb_wl6347_comp_indx_stat.test
 share/mysql/test/suite/innodb/t/portability_wl5980_linux.zip
 share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip
 share/mysql/test/suite/innodb_fts/r/fulltext.result
@@ -3800,6 +3763,52 @@ share/mysql/test/suite/innodb_fts/t/innodb_fts_result_cache_limit.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_savepoint.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_transaction.test
+share/mysql/test/suite/innodb_zip/include/innodb_create_tab_indx.inc
+share/mysql/test/suite/innodb_zip/include/innodb_fetch_records.inc
+share/mysql/test/suite/innodb_zip/include/innodb_load_data.inc
+share/mysql/test/suite/innodb_zip/include/innodb_stats_comp_index.inc
+share/mysql/test/suite/innodb_zip/include/innodb_stats_restart.inc
+share/mysql/test/suite/innodb_zip/r/innodb-create-options.result
+share/mysql/test/suite/innodb_zip/r/innodb-restart.result
+share/mysql/test/suite/innodb_zip/r/innodb-wl5522-debug-zip.result
+share/mysql/test/suite/innodb_zip/r/innodb-wl5522-zip.result
+share/mysql/test/suite/innodb_zip/r/innodb-zip.result
+share/mysql/test/suite/innodb_zip/r/innodb_16k.result
+share/mysql/test/suite/innodb_zip/r/innodb_4k.result
+share/mysql/test/suite/innodb_zip/r/innodb_8k.result
+share/mysql/test/suite/innodb_zip/r/innodb_bug36169.result
+share/mysql/test/suite/innodb_zip/r/innodb_bug36172.result
+share/mysql/test/suite/innodb_zip/r/innodb_bug52745.result
+share/mysql/test/suite/innodb_zip/r/innodb_bug53591.result
+share/mysql/test/suite/innodb_zip/r/innodb_bug56680.result
+share/mysql/test/suite/innodb_zip/r/innodb_cmp_drop_table.result
+share/mysql/test/suite/innodb_zip/r/innodb_cmp_per_index.result
+share/mysql/test/suite/innodb_zip/r/innodb_index_large_prefix.result
+share/mysql/test/suite/innodb_zip/r/innodb_index_large_prefix_4k.result
+share/mysql/test/suite/innodb_zip/r/innodb_index_large_prefix_8k.result
+share/mysql/test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result
+share/mysql/test/suite/innodb_zip/r/innodb_wl6347_comp_indx_stat.result
+share/mysql/test/suite/innodb_zip/t/innodb-create-options.test
+share/mysql/test/suite/innodb_zip/t/innodb-restart.test
+share/mysql/test/suite/innodb_zip/t/innodb-wl5522-debug-zip.test
+share/mysql/test/suite/innodb_zip/t/innodb-wl5522-zip.test
+share/mysql/test/suite/innodb_zip/t/innodb-zip.test
+share/mysql/test/suite/innodb_zip/t/innodb_16k.test
+share/mysql/test/suite/innodb_zip/t/innodb_4k.test
+share/mysql/test/suite/innodb_zip/t/innodb_8k.test
+share/mysql/test/suite/innodb_zip/t/innodb_bug36169.test
+share/mysql/test/suite/innodb_zip/t/innodb_bug36172.test
+share/mysql/test/suite/innodb_zip/t/innodb_bug52745.test
+share/mysql/test/suite/innodb_zip/t/innodb_bug53591.test
+share/mysql/test/suite/innodb_zip/t/innodb_bug56680.test
+share/mysql/test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt
+share/mysql/test/suite/innodb_zip/t/innodb_cmp_drop_table.test
+share/mysql/test/suite/innodb_zip/t/innodb_cmp_per_index.test
+share/mysql/test/suite/innodb_zip/t/innodb_index_large_prefix.test
+share/mysql/test/suite/innodb_zip/t/innodb_index_large_prefix_4k.test
+share/mysql/test/suite/innodb_zip/t/innodb_index_large_prefix_8k.test
+share/mysql/test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test
+share/mysql/test/suite/innodb_zip/t/innodb_wl6347_comp_indx_stat.test
 share/mysql/test/suite/jp/include/trim_sjis.inc
 share/mysql/test/suite/jp/r/jp_alter_sjis.result
 share/mysql/test/suite/jp/r/jp_alter_ucs2.result
@@ -7194,6 +7203,7 @@ share/mysql/test/suite/sys_vars/r/innodb_api_trx_level_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result
+share/mysql/test/suite/sys_vars/r/innodb_buf_flush_list_now_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_evict_basic.result
@@ -7297,6 +7307,8 @@ share/mysql/test/suite/sys_vars/r/innodb_stats_persistent_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_status_output_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_status_output_locks_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_strict_mode_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_support_xa_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_support_xa_func.result
@@ -7792,6 +7804,7 @@ share/mysql/test/suite/sys_vars/t/innodb_autoextend_increment_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt
 share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
+share/mysql/test/suite/sys_vars/t/innodb_buf_flush_list_now_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_dump_at_shutdown_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
@@ -7898,6 +7911,8 @@ share/mysql/test/suite/sys_vars/t/innodb_stats_persistent_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_stats_persistent_sample_pages_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_status_output_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_status_output_locks_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_strict_mode_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_support_xa_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_support_xa_func.test
@@ -9231,7 +9246,6 @@ share/mysql/test/t/view_grant.test
 share/mysql/test/t/wait_timeout.test
 share/mysql/test/t/warnings-master.opt
 share/mysql/test/t/warnings.test
-share/mysql/test/t/warnings_engine_disabled-master.opt
 share/mysql/test/t/warnings_engine_disabled.test
 share/mysql/test/t/windows.test
 share/mysql/test/t/wl4435_generated.inc