Pullup ticket #3129 - requested by taca

databases/mysql51-client: security update
databases/mysql51-server: security update

Revisions pulled up:
- databases/mysql51-client/Makefile.common	1.6-1.8
- databases/mysql51-client/distinfo		1.3-1.4
- databases/mysql51-server/Makefile		1.5
- databases/mysql51-server/PLIST		1.4-1.5
- databases/mysql51-server/distinfo		1.4-1.6
- databases/mysql51-server/patches/patch-av	delete
- databases/mysql51-server/patches/patch-ay	1.1
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Sat Apr 24 15:59:24 UTC 2010

Modified Files:
	pkgsrc/databases/mysql51-client: Makefile.common distinfo
	pkgsrc/databases/mysql51-server: Makefile PLIST distinfo
Removed Files:
	pkgsrc/databases/mysql51-server/patches: patch-av

Log Message:
Update mysql51-client/mysql51-server package to 5.1.46.

This is maintainous release and please refer for full changes:

	http://dev.mysql.com/doc/refman/5.1/en/news-5-1-46.html
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Fri Apr 30 06:03:36 UTC 2010

Modified Files:
	pkgsrc/databases/mysql51-client: Makefile.common

Log Message:
Interix GNU cc doesn't support `-fPIC'.
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Wed May 26 01:52:22 UTC 2010

Modified Files:
	pkgsrc/databases/mysql51-client: Makefile.common distinfo
	pkgsrc/databases/mysql51-server: PLIST distinfo
Added Files:
	pkgsrc/databases/mysql51-server/patches: patch-ay

Log Message:
Update mysql51-{client,server} package to 5.1.47.

For full changes, see http://dev.mysql.com/doc/refman/5.1/en/news-5-1-47.html.

Here is important changes:

InnoDB Plugin Notes:

    * InnoDB Plugin has been upgraded to version 1.0.8. This version
      is considered of General Availability (GA) quality. InnoDB
      Plugin Change History, may contain information in addition to
      those changes reported here.

      In this release, the InnoDB Plugin is included in source and
      binary distributions, except RHEL3, RHEL4, SuSE 9 (x86, x86_64,
      ia64), and generic Linux RPM packages. It also does not work for
      FreeBSD 6 and HP-UX or for Linux on generic ia64.

Functionality added or changed:

    * InnoDB stores redo log records in a hash table during
      recovery. On 64-bit systems, this hash table was 1/8 of the
      buffer pool size. To reduce memory usage, the dimension of the
      hash table was reduced to 1/64 of the buffer pool size (or 1/128
      on 32-bit systems). (Bug#53122)

Security fixed:

    * Security Fix: The server failed to check the table name argument
      of a COM_FIELD_LIST command packet for validity and compliance
      to acceptable table name standards. This could be exploited to
      bypass almost all forms of checks for privileges and table-level
      grants by providing a specially crafted table name argument to
      COM_FIELD_LIST.

      In MySQL 5.0 and above, this allowed an authenticated user with
      SELECT privileges on one table to obtain the field definitions
      of any table in all other databases and potentially of other
      MySQL instances accessible from the server's file system.

      Additionally, for MySQL version 5.1 and above, an authenticated
    user with DELETE or SELECT privileges on one table could delete or
    read content from any other table in all databases on this server,
    and potentially of other MySQL instances accessible from the
    server's file system. (Bug#53371, CVE-2010-1848)

    * Security Fix: The server was susceptible to a buffer-overflow
      attack due to a failure to perform bounds checking on the table
      name argument of a COM_FIELD_LIST command packet. By sending
      long data for the table name, a buffer is overflown, which could
      be exploited by an authenticated user to inject malicious
      code. (Bug#53237, CVE-2010-1850)

    * Security Fix: The server could be tricked into reading packets
      indefinitely if it received a packet larger than the maximum
      size of one packet. (Bug#50974, CVE-2010-1849)

7 files changed, 1034 insertions, 110 deletions

diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index 7371930545f..6b6ee70ae38 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.4.2.1 2010/04/21 06:30:05 spz Exp $
+# $NetBSD: Makefile.common,v 1.4.2.2 2010/05/26 17:13:53 tron Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 #
 
-DISTNAME=		mysql-5.1.45
+DISTNAME=		mysql-5.1.47
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
@@ -87,8 +87,10 @@ CONFIGURE_ENV+=		mysql_cv_compress="yes"
 CPPFLAGS+=		-Dunix
 CFLAGS+=		-DUSE_OLD_FUNCTIONS # 3.23.x compat
 
+.if ${OPSYS} != "Interix"
 CFLAGS+=		-fPIC -DPIC
 CXXFLAGS+=		-fPIC -DPIC
+.endif
 
 # force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 21ddc375a52..c0744fab9ed 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1.2.1 2010/04/21 06:30:05 spz Exp $
+$NetBSD: distinfo,v 1.1.1.1.2.2 2010/05/26 17:13:53 tron Exp $
 
-SHA1 (mysql-5.1.45.tar.gz) = 2a34650dc1a7e056788882522211d07791e0b352
-RMD160 (mysql-5.1.45.tar.gz) = 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba
-Size (mysql-5.1.45.tar.gz) = 22457274 bytes
+SHA1 (mysql-5.1.47.tar.gz) = 9ea8b2cfedb366b884eaeb37757de1cdbbd85b45
+RMD160 (mysql-5.1.47.tar.gz) = ee399fe1ba393c9cd4c19ec43ccea68a6a9f43e3
+Size (mysql-5.1.47.tar.gz) = 23817441 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4
 SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index f55954e58b8..a78609ed86e 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.2.1 2010/04/21 06:30:05 spz Exp $
+# $NetBSD: Makefile,v 1.3.2.2 2010/05/26 17:13:53 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=		mysqs
@@ -67,6 +67,7 @@ REPLACE_PERL+=		mysql-test/lib/My/SafeProcess/safe_process.pl \
 			mysql-test/lib/v1/mysql-test-run.pl \
 			mysql-test/mysql-stress-test.pl \
 			mysql-test/mysql-test-run.pl \
+			mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl \
 			mysql-test/suite/funcs_1/lib/DataGen_local.pl \
 			mysql-test/suite/funcs_1/lib/DataGen_modify.pl \
 			mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl \
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index e172a6cd9ca..1e6319f3653 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2.2.1 2010/04/21 06:30:05 spz Exp $
+@comment $NetBSD: PLIST,v 1.2.2.2 2010/05/26 17:13:53 tron Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -247,6 +247,7 @@ share/mysql-test/include/have_gb2312.inc
 share/mysql-test/include/have_gbk.inc
 share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_innodb.inc
+share/mysql-test/include/have_innodb_plugin.inc
 share/mysql-test/include/have_koi8r.inc
 share/mysql-test/include/have_latin2_ch.inc
 share/mysql-test/include/have_local_infile.inc
@@ -288,6 +289,7 @@ share/mysql-test/include/loaddata_autocom.inc
 share/mysql-test/include/master-slave-end.inc
 share/mysql-test/include/master-slave-reset.inc
 share/mysql-test/include/master-slave.inc
+share/mysql-test/include/min_null_cond.inc
 share/mysql-test/include/mix1.inc
 share/mysql-test/include/mix2.inc
 share/mysql-test/include/mix2_ucs2.inc
@@ -375,6 +377,7 @@ share/mysql-test/include/truncate_file.inc
 share/mysql-test/include/unsafe_binlog.inc
 share/mysql-test/include/uses_vardir.inc
 share/mysql-test/include/varchar.inc
+share/mysql-test/include/view_alias.inc
 share/mysql-test/include/wait_condition.inc
 share/mysql-test/include/wait_condition_sp.inc
 share/mysql-test/include/wait_for_binlog_event.inc
@@ -463,6 +466,7 @@ share/mysql-test/r/bool.result
 share/mysql-test/r/bootstrap.result
 share/mysql-test/r/bug39022.result
 share/mysql-test/r/bug46080.result
+share/mysql-test/r/bug46261.result
 share/mysql-test/r/bug46760.result
 share/mysql-test/r/bug47671.result
 share/mysql-test/r/bulk_replace.result
@@ -681,30 +685,11 @@ share/mysql-test/r/information_schema_inno.result
 share/mysql-test/r/information_schema_part.result
 share/mysql-test/r/init_connect.result
 share/mysql-test/r/init_file.result
-share/mysql-test/r/innodb-autoinc-44030.result
 share/mysql-test/r/innodb-autoinc-optimize.result
-share/mysql-test/r/innodb-autoinc.result
-share/mysql-test/r/innodb-lock.result
-share/mysql-test/r/innodb-replace.result
-share/mysql-test/r/innodb-semi-consistent.result
 share/mysql-test/r/innodb-ucs2.result
-share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_autoinc_lock_mode_zero.result
-share/mysql-test/r/innodb_bug21704.result
 share/mysql-test/r/innodb_bug30919.result
-share/mysql-test/r/innodb_bug34053.result
-share/mysql-test/r/innodb_bug34300.result
-share/mysql-test/r/innodb_bug35220.result
-share/mysql-test/r/innodb_bug38231.result
-share/mysql-test/r/innodb_bug39438.result
-share/mysql-test/r/innodb_bug40565.result
-share/mysql-test/r/innodb_bug42101-nonzero.result
-share/mysql-test/r/innodb_bug42101.result
 share/mysql-test/r/innodb_bug42419.result
-share/mysql-test/r/innodb_bug44369.result
-share/mysql-test/r/innodb_bug45357.result
-share/mysql-test/r/innodb_bug46000.result
-share/mysql-test/r/innodb_bug47777.result
 share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_ignore_builtin.result
 share/mysql-test/r/innodb_lock_wait_timeout_1.result
@@ -712,7 +697,6 @@ share/mysql-test/r/innodb_mysql.result
 share/mysql-test/r/innodb_mysql_rbk.result
 share/mysql-test/r/innodb_notembedded.result
 share/mysql-test/r/innodb_timeout_rollback.result
-share/mysql-test/r/innodb_trx_weight.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_notembedded.result
 share/mysql-test/r/insert_select.result
@@ -744,6 +728,7 @@ share/mysql-test/r/log_state.result
 share/mysql-test/r/log_tables-big.result
 share/mysql-test/r/log_tables.result
 share/mysql-test/r/log_tables_debug.result
+share/mysql-test/r/log_tables_upgrade.result
 share/mysql-test/r/long_tmpdir.result
 share/mysql-test/r/lowercase0.require
 share/mysql-test/r/lowercase1.require
@@ -868,6 +853,7 @@ share/mysql-test/r/perror-win.result
 share/mysql-test/r/perror.result
 share/mysql-test/r/plugin.result
 share/mysql-test/r/plugin_load.result
+share/mysql-test/r/plugin_not_embedded.result
 share/mysql-test/r/preload.result
 share/mysql-test/r/profiling.result
 share/mysql-test/r/ps.result
@@ -1014,6 +1000,7 @@ share/mysql-test/r/variables.result
 share/mysql-test/r/variables_community.result
 share/mysql-test/r/variables_debug.result
 share/mysql-test/r/view.result
+share/mysql-test/r/view_alias.result
 share/mysql-test/r/view_grant.result
 share/mysql-test/r/wait_timeout.result
 share/mysql-test/r/warnings.result
@@ -1026,6 +1013,7 @@ share/mysql-test/std_data/14897.frm
 share/mysql-test/std_data/Index.xml
 share/mysql-test/std_data/Moscow_leap
 share/mysql-test/std_data/bad_gis_data.dat
+share/mysql-test/std_data/binlog_savepoint.000001
 share/mysql-test/std_data/binlog_transaction.000001
 share/mysql-test/std_data/bug15328.cnf
 share/mysql-test/std_data/bug16266.000001
@@ -1043,11 +1031,17 @@ share/mysql-test/std_data/bug37631.MYD
 share/mysql-test/std_data/bug37631.MYI
 share/mysql-test/std_data/bug37631.frm
 share/mysql-test/std_data/bug40482-bin.000001
+share/mysql-test/std_data/bug46565.ARZ
+share/mysql-test/std_data/bug46565.frm
 share/mysql-test/std_data/bug47012.ARM
 share/mysql-test/std_data/bug47012.ARZ
 share/mysql-test/std_data/bug47012.frm
 share/mysql-test/std_data/bug47142_master-bin.000001
+share/mysql-test/std_data/bug48265.frm
 share/mysql-test/std_data/bug48449.frm
+share/mysql-test/std_data/bug49823.CSM
+share/mysql-test/std_data/bug49823.CSV
+share/mysql-test/std_data/bug49823.frm
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/charset_utf8.txt
 share/mysql-test/std_data/client-cert.pem
@@ -1288,6 +1282,920 @@ share/mysql-test/suite/bugs/t/rpl_bug36391-master.opt
 share/mysql-test/suite/bugs/t/rpl_bug36391.test
 share/mysql-test/suite/bugs/t/rpl_bug37426.test
 share/mysql-test/suite/bugs/t/rpl_bug38205.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
+share/mysql-test/suite/engines/funcs/r/ai_init_insert.result
+share/mysql-test/suite/engines/funcs/r/ai_init_insert_id.result
+share/mysql-test/suite/engines/funcs/r/ai_overflow_error.result
+share/mysql-test/suite/engines/funcs/r/ai_reset_by_truncate.result
+share/mysql-test/suite/engines/funcs/r/ai_sql_auto_is_null.result
+share/mysql-test/suite/engines/funcs/r/an_calendar.result
+share/mysql-test/suite/engines/funcs/r/an_number.result
+share/mysql-test/suite/engines/funcs/r/an_string.result
+share/mysql-test/suite/engines/funcs/r/comment_column.result
+share/mysql-test/suite/engines/funcs/r/comment_column2.result
+share/mysql-test/suite/engines/funcs/r/comment_table.result
+share/mysql-test/suite/engines/funcs/r/crash_manycolumns_number.result
+share/mysql-test/suite/engines/funcs/r/crash_manycolumns_string.result
+share/mysql-test/suite/engines/funcs/r/crash_manyindexes_number.result
+share/mysql-test/suite/engines/funcs/r/crash_manyindexes_string.result
+share/mysql-test/suite/engines/funcs/r/crash_manytables_number.result
+share/mysql-test/suite/engines/funcs/r/crash_manytables_string.result
+share/mysql-test/suite/engines/funcs/r/date_function.result
+share/mysql-test/suite/engines/funcs/r/datetime_function.result
+share/mysql-test/suite/engines/funcs/r/db_alter_character_set.result
+share/mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result
+share/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
+share/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
+share/mysql-test/suite/engines/funcs/r/db_create_character_set.result
+share/mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result
+share/mysql-test/suite/engines/funcs/r/db_create_drop.result
+share/mysql-test/suite/engines/funcs/r/db_create_error.result
+share/mysql-test/suite/engines/funcs/r/db_create_error_reserved.result
+share/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result
+share/mysql-test/suite/engines/funcs/r/db_drop_error.result
+share/mysql-test/suite/engines/funcs/r/db_use_error.result
+share/mysql-test/suite/engines/funcs/r/de_autoinc.result
+share/mysql-test/suite/engines/funcs/r/de_calendar_range.result
+share/mysql-test/suite/engines/funcs/r/de_ignore.result
+share/mysql-test/suite/engines/funcs/r/de_limit.result
+share/mysql-test/suite/engines/funcs/r/de_multi_db_table.result
+share/mysql-test/suite/engines/funcs/r/de_multi_db_table_using.result
+share/mysql-test/suite/engines/funcs/r/de_multi_table.result
+share/mysql-test/suite/engines/funcs/r/de_multi_table_using.result
+share/mysql-test/suite/engines/funcs/r/de_number_range.result
+share/mysql-test/suite/engines/funcs/r/de_quick.result
+share/mysql-test/suite/engines/funcs/r/de_string_range.result
+share/mysql-test/suite/engines/funcs/r/de_truncate.result
+share/mysql-test/suite/engines/funcs/r/de_truncate_autoinc.result
+share/mysql-test/suite/engines/funcs/r/fu_aggregate_avg_number.result
+share/mysql-test/suite/engines/funcs/r/fu_aggregate_count_number.result
+share/mysql-test/suite/engines/funcs/r/fu_aggregate_max_number.result
+share/mysql-test/suite/engines/funcs/r/fu_aggregate_max_subquery.result
+share/mysql-test/suite/engines/funcs/r/fu_aggregate_min_number.result
+share/mysql-test/suite/engines/funcs/r/fu_aggregate_sum_number.result
+share/mysql-test/suite/engines/funcs/r/general_no_data.result
+share/mysql-test/suite/engines/funcs/r/general_not_null.result
+share/mysql-test/suite/engines/funcs/r/general_null.result
+share/mysql-test/suite/engines/funcs/r/in_calendar_2_unique_constraints_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_calendar_pk_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_calendar_unique_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_enum_null.result
+share/mysql-test/suite/engines/funcs/r/in_enum_null_boundary_error.result
+share/mysql-test/suite/engines/funcs/r/in_enum_null_large_error.result
+share/mysql-test/suite/engines/funcs/r/in_insert_select.result
+share/mysql-test/suite/engines/funcs/r/in_insert_select_autoinc.result
+share/mysql-test/suite/engines/funcs/r/in_insert_select_unique_violation.result
+share/mysql-test/suite/engines/funcs/r/in_lob_boundary_error.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_pk_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_calendar_unique_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_number_pk_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_number_unique_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_number_2_unique_constraints_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_number_boundary_error.result
+share/mysql-test/suite/engines/funcs/r/in_number_decimal_boundary_error.result
+share/mysql-test/suite/engines/funcs/r/in_number_length.result
+share/mysql-test/suite/engines/funcs/r/in_number_null.result
+share/mysql-test/suite/engines/funcs/r/in_number_pk_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_number_pk_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_number_pk_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_number_unique_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_number_unique_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_number_unique_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_set_null.result
+share/mysql-test/suite/engines/funcs/r/in_set_null_boundary_error.result
+share/mysql-test/suite/engines/funcs/r/in_set_null_large.result
+share/mysql-test/suite/engines/funcs/r/in_string_2_unique_constraints_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_string_boundary_error.result
+share/mysql-test/suite/engines/funcs/r/in_string_not_null.result
+share/mysql-test/suite/engines/funcs/r/in_string_null.result
+share/mysql-test/suite/engines/funcs/r/in_string_pk_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_string_pk_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_string_pk_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/in_string_set_enum_fail.result
+share/mysql-test/suite/engines/funcs/r/in_string_unique_constraint_duplicate_update.result
+share/mysql-test/suite/engines/funcs/r/in_string_unique_constraint_error.result
+share/mysql-test/suite/engines/funcs/r/in_string_unique_constraint_ignore.result
+share/mysql-test/suite/engines/funcs/r/ix_drop.result
+share/mysql-test/suite/engines/funcs/r/ix_drop_error.result
+share/mysql-test/suite/engines/funcs/r/ix_index_decimals.result
+share/mysql-test/suite/engines/funcs/r/ix_index_lob.result
+share/mysql-test/suite/engines/funcs/r/ix_index_non_string.result
+share/mysql-test/suite/engines/funcs/r/ix_index_string.result
+share/mysql-test/suite/engines/funcs/r/ix_index_string_length.result
+share/mysql-test/suite/engines/funcs/r/ix_unique_decimals.result
+share/mysql-test/suite/engines/funcs/r/ix_unique_lob.result
+share/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result
+share/mysql-test/suite/engines/funcs/r/ix_unique_string.result
+share/mysql-test/suite/engines/funcs/r/ix_unique_string_length.result
+share/mysql-test/suite/engines/funcs/r/ix_using_order.result
+share/mysql-test/suite/engines/funcs/r/jp_comment_column.result
+share/mysql-test/suite/engines/funcs/r/jp_comment_older_compatibility1.result
+share/mysql-test/suite/engines/funcs/r/jp_comment_table.result
+share/mysql-test/suite/engines/funcs/r/ld_all_number_string_calendar_types.result
+share/mysql-test/suite/engines/funcs/r/ld_bit.result
+share/mysql-test/suite/engines/funcs/r/ld_enum_set.result
+share/mysql-test/suite/engines/funcs/r/ld_less_columns.result
+share/mysql-test/suite/engines/funcs/r/ld_more_columns_truncated.result
+share/mysql-test/suite/engines/funcs/r/ld_null.result
+share/mysql-test/suite/engines/funcs/r/ld_quote.result
+share/mysql-test/suite/engines/funcs/r/ld_simple.result
+share/mysql-test/suite/engines/funcs/r/ld_starting.result
+share/mysql-test/suite/engines/funcs/r/ld_unique_error1.result
+share/mysql-test/suite/engines/funcs/r/ld_unique_error1_local.result
+share/mysql-test/suite/engines/funcs/r/ld_unique_error2.result
+share/mysql-test/suite/engines/funcs/r/ld_unique_error2_local.result
+share/mysql-test/suite/engines/funcs/r/ld_unique_error3.result
+share/mysql-test/suite/engines/funcs/r/ld_unique_error3_local.result
+share/mysql-test/suite/engines/funcs/r/ps_number_length.result
+share/mysql-test/suite/engines/funcs/r/ps_number_null.result
+share/mysql-test/suite/engines/funcs/r/ps_string_not_null.result
+share/mysql-test/suite/engines/funcs/r/ps_string_null.result
+share/mysql-test/suite/engines/funcs/r/re_number_range.result
+share/mysql-test/suite/engines/funcs/r/re_number_range_set.result
+share/mysql-test/suite/engines/funcs/r/re_number_select.result
+share/mysql-test/suite/engines/funcs/r/re_string_range.result
+share/mysql-test/suite/engines/funcs/r/re_string_range_set.result
+share/mysql-test/suite/engines/funcs/r/rpl000010.result
+share/mysql-test/suite/engines/funcs/r/rpl000011.result
+share/mysql-test/suite/engines/funcs/r/rpl000013.result
+share/mysql-test/suite/engines/funcs/r/rpl000017.result
+share/mysql-test/suite/engines/funcs/r/rpl_000015.result
+share/mysql-test/suite/engines/funcs/r/rpl_LD_INFILE.result
+share/mysql-test/suite/engines/funcs/r/rpl_REDIRECT.result
+share/mysql-test/suite/engines/funcs/r/rpl_alter.result
+share/mysql-test/suite/engines/funcs/r/rpl_alter_db.result
+share/mysql-test/suite/engines/funcs/r/rpl_bit.result
+share/mysql-test/suite/engines/funcs/r/rpl_bit_npk.result
+share/mysql-test/suite/engines/funcs/r/rpl_change_master.result
+share/mysql-test/suite/engines/funcs/r/rpl_create_database.result
+share/mysql-test/suite/engines/funcs/r/rpl_do_grant.result
+share/mysql-test/suite/engines/funcs/r/rpl_drop.result
+share/mysql-test/suite/engines/funcs/r/rpl_drop_db.result
+share/mysql-test/suite/engines/funcs/r/rpl_dual_pos_advance.result
+share/mysql-test/suite/engines/funcs/r/rpl_empty_master_crash.result
+share/mysql-test/suite/engines/funcs/r/rpl_err_ignoredtable.result
+share/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result
+share/mysql-test/suite/engines/funcs/r/rpl_free_items.result
+share/mysql-test/suite/engines/funcs/r/rpl_get_lock.result
+share/mysql-test/suite/engines/funcs/r/rpl_ignore_grant.result
+share/mysql-test/suite/engines/funcs/r/rpl_ignore_revoke.result
+share/mysql-test/suite/engines/funcs/r/rpl_ignore_table_update.result
+share/mysql-test/suite/engines/funcs/r/rpl_init_slave.result
+share/mysql-test/suite/engines/funcs/r/rpl_insert.result
+share/mysql-test/suite/engines/funcs/r/rpl_insert_select.result
+share/mysql-test/suite/engines/funcs/r/rpl_loaddata2.result
+share/mysql-test/suite/engines/funcs/r/rpl_loaddata_m.result
+share/mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result
+share/mysql-test/suite/engines/funcs/r/rpl_loaddatalocal.result
+share/mysql-test/suite/engines/funcs/r/rpl_loadfile.result
+share/mysql-test/suite/engines/funcs/r/rpl_log_pos.result
+share/mysql-test/suite/engines/funcs/r/rpl_many_optimize.result
+share/mysql-test/suite/engines/funcs/r/rpl_master_pos_wait.result
+share/mysql-test/suite/engines/funcs/r/rpl_misc_functions.result
+share/mysql-test/suite/engines/funcs/r/rpl_multi_delete.result
+share/mysql-test/suite/engines/funcs/r/rpl_multi_delete2.result
+share/mysql-test/suite/engines/funcs/r/rpl_multi_update4.result
+share/mysql-test/suite/engines/funcs/r/rpl_ps.result
+share/mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result
+share/mysql-test/suite/engines/funcs/r/rpl_relayspace.result
+share/mysql-test/suite/engines/funcs/r/rpl_replicate_ignore_db.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_NOW.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_USER.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_drop.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_func001.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_max_relay_size.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_sp001.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_sp005.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_sp008.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_sp009.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_sp010.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_sp011.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_sp012.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_stop_middle.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_trig001.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_trig002.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_trig003.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_until.result
+share/mysql-test/suite/engines/funcs/r/rpl_row_view01.result
+share/mysql-test/suite/engines/funcs/r/rpl_server_id1.result
+share/mysql-test/suite/engines/funcs/r/rpl_server_id2.result
+share/mysql-test/suite/engines/funcs/r/rpl_session_var.result
+share/mysql-test/suite/engines/funcs/r/rpl_sf.result
+share/mysql-test/suite/engines/funcs/r/rpl_skip_error.result
+share/mysql-test/suite/engines/funcs/r/rpl_slave_status.result
+share/mysql-test/suite/engines/funcs/r/rpl_sp.result
+share/mysql-test/suite/engines/funcs/r/rpl_sp004.result
+share/mysql-test/suite/engines/funcs/r/rpl_sp_effects.result
+share/mysql-test/suite/engines/funcs/r/rpl_start_stop_slave.result
+share/mysql-test/suite/engines/funcs/r/rpl_stm_max_relay_size.result
+share/mysql-test/suite/engines/funcs/r/rpl_stm_mystery22.result
+share/mysql-test/suite/engines/funcs/r/rpl_stm_no_op.result
+share/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result
+share/mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result
+share/mysql-test/suite/engines/funcs/r/rpl_temp_table.result
+share/mysql-test/suite/engines/funcs/r/rpl_temporary.result
+share/mysql-test/suite/engines/funcs/r/rpl_trigger.result
+share/mysql-test/suite/engines/funcs/r/rpl_trunc_temp.result
+share/mysql-test/suite/engines/funcs/r/rpl_user_variables.result
+share/mysql-test/suite/engines/funcs/r/rpl_variables.result
+share/mysql-test/suite/engines/funcs/r/rpl_view.result
+share/mysql-test/suite/engines/funcs/r/se_join_cross.result
+share/mysql-test/suite/engines/funcs/r/se_join_default.result
+share/mysql-test/suite/engines/funcs/r/se_join_inner.result
+share/mysql-test/suite/engines/funcs/r/se_join_left.result
+share/mysql-test/suite/engines/funcs/r/se_join_left_outer.result
+share/mysql-test/suite/engines/funcs/r/se_join_natural_left.result
+share/mysql-test/suite/engines/funcs/r/se_join_natural_left_outer.result
+share/mysql-test/suite/engines/funcs/r/se_join_natural_right.result
+share/mysql-test/suite/engines/funcs/r/se_join_natural_right_outer.result
+share/mysql-test/suite/engines/funcs/r/se_join_right.result
+share/mysql-test/suite/engines/funcs/r/se_join_right_outer.result
+share/mysql-test/suite/engines/funcs/r/se_join_straight.result
+share/mysql-test/suite/engines/funcs/r/se_rowid.result
+share/mysql-test/suite/engines/funcs/r/se_string_distinct.result
+share/mysql-test/suite/engines/funcs/r/se_string_from.result
+share/mysql-test/suite/engines/funcs/r/se_string_groupby.result
+share/mysql-test/suite/engines/funcs/r/se_string_having.result
+share/mysql-test/suite/engines/funcs/r/se_string_limit.result
+share/mysql-test/suite/engines/funcs/r/se_string_orderby.result
+share/mysql-test/suite/engines/funcs/r/se_string_union.result
+share/mysql-test/suite/engines/funcs/r/se_string_where.result
+share/mysql-test/suite/engines/funcs/r/se_string_where_and.result
+share/mysql-test/suite/engines/funcs/r/se_string_where_or.result
+share/mysql-test/suite/engines/funcs/r/sf_alter.result
+share/mysql-test/suite/engines/funcs/r/sf_cursor.result
+share/mysql-test/suite/engines/funcs/r/sf_simple1.result
+share/mysql-test/suite/engines/funcs/r/sp_alter.result
+share/mysql-test/suite/engines/funcs/r/sp_cursor.result
+share/mysql-test/suite/engines/funcs/r/sp_simple1.result
+share/mysql-test/suite/engines/funcs/r/sq_all.result
+share/mysql-test/suite/engines/funcs/r/sq_any.result
+share/mysql-test/suite/engines/funcs/r/sq_corr.result
+share/mysql-test/suite/engines/funcs/r/sq_error.result
+share/mysql-test/suite/engines/funcs/r/sq_exists.result
+share/mysql-test/suite/engines/funcs/r/sq_from.result
+share/mysql-test/suite/engines/funcs/r/sq_in.result
+share/mysql-test/suite/engines/funcs/r/sq_row.result
+share/mysql-test/suite/engines/funcs/r/sq_scalar.result
+share/mysql-test/suite/engines/funcs/r/sq_some.result
+share/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result
+share/mysql-test/suite/engines/funcs/r/ta_2part_diff_string_to_pk.result
+share/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result
+share/mysql-test/suite/engines/funcs/r/ta_2part_string_to_pk.result
+share/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result
+share/mysql-test/suite/engines/funcs/r/ta_3part_string_to_pk.result
+share/mysql-test/suite/engines/funcs/r/ta_add_column.result
+share/mysql-test/suite/engines/funcs/r/ta_add_column2.result
+share/mysql-test/suite/engines/funcs/r/ta_add_column_first.result
+share/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result
+share/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result
+share/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result
+share/mysql-test/suite/engines/funcs/r/ta_add_string.result
+share/mysql-test/suite/engines/funcs/r/ta_add_string2.result
+share/mysql-test/suite/engines/funcs/r/ta_add_string_first.result
+share/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result
+share/mysql-test/suite/engines/funcs/r/ta_add_string_middle.result
+share/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result
+share/mysql-test/suite/engines/funcs/r/ta_add_string_unique_index.result
+share/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result
+share/mysql-test/suite/engines/funcs/r/ta_column_from_unsigned.result
+share/mysql-test/suite/engines/funcs/r/ta_column_from_zerofill.result
+share/mysql-test/suite/engines/funcs/r/ta_column_to_index.result
+share/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result
+share/mysql-test/suite/engines/funcs/r/ta_column_to_null.result
+share/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result
+share/mysql-test/suite/engines/funcs/r/ta_column_to_unsigned.result
+share/mysql-test/suite/engines/funcs/r/ta_column_to_zerofill.result
+share/mysql-test/suite/engines/funcs/r/ta_drop_column.result
+share/mysql-test/suite/engines/funcs/r/ta_drop_index.result
+share/mysql-test/suite/engines/funcs/r/ta_drop_pk_autoincrement.result
+share/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result
+share/mysql-test/suite/engines/funcs/r/ta_drop_pk_string.result
+share/mysql-test/suite/engines/funcs/r/ta_drop_string_index.result
+share/mysql-test/suite/engines/funcs/r/ta_orderby.result
+share/mysql-test/suite/engines/funcs/r/ta_rename.result
+share/mysql-test/suite/engines/funcs/r/ta_set_drop_default.result
+share/mysql-test/suite/engines/funcs/r/ta_string_drop_column.result
+share/mysql-test/suite/engines/funcs/r/ta_string_to_index.result
+share/mysql-test/suite/engines/funcs/r/ta_string_to_not_null.result
+share/mysql-test/suite/engines/funcs/r/ta_string_to_null.result
+share/mysql-test/suite/engines/funcs/r/ta_string_to_pk.result
+share/mysql-test/suite/engines/funcs/r/tc_column_autoincrement.result
+share/mysql-test/suite/engines/funcs/r/tc_column_comment.result
+share/mysql-test/suite/engines/funcs/r/tc_column_comment_string.result
+share/mysql-test/suite/engines/funcs/r/tc_column_default_decimal.result
+share/mysql-test/suite/engines/funcs/r/tc_column_default_number.result
+share/mysql-test/suite/engines/funcs/r/tc_column_default_string.result
+share/mysql-test/suite/engines/funcs/r/tc_column_enum.result
+share/mysql-test/suite/engines/funcs/r/tc_column_enum_long.result
+share/mysql-test/suite/engines/funcs/r/tc_column_key.result
+share/mysql-test/suite/engines/funcs/r/tc_column_key_length.result
+share/mysql-test/suite/engines/funcs/r/tc_column_length.result
+share/mysql-test/suite/engines/funcs/r/tc_column_length_decimals.result
+share/mysql-test/suite/engines/funcs/r/tc_column_length_zero.result
+share/mysql-test/suite/engines/funcs/r/tc_column_not_null.result
+share/mysql-test/suite/engines/funcs/r/tc_column_null.result
+share/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result
+share/mysql-test/suite/engines/funcs/r/tc_column_primary_key_string.result
+share/mysql-test/suite/engines/funcs/r/tc_column_serial.result
+share/mysql-test/suite/engines/funcs/r/tc_column_set.result
+share/mysql-test/suite/engines/funcs/r/tc_column_set_long.result
+share/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result
+share/mysql-test/suite/engines/funcs/r/tc_column_unique_key_string.result
+share/mysql-test/suite/engines/funcs/r/tc_column_unsigned.result
+share/mysql-test/suite/engines/funcs/r/tc_column_zerofill.result
+share/mysql-test/suite/engines/funcs/r/tc_drop_table.result
+share/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result
+share/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result
+share/mysql-test/suite/engines/funcs/r/tc_multicolumn_same_string.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_analyze.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_change_from_range_to_hash_key.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_check.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_hash.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_hash_date_function.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_key.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_linear_key.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_list_directory.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_list_error.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_optimize.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_rebuild.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_remove.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_reorg_divide.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_reorg_hash_key.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_reorg_merge.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_repair.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_sub1.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_sub2.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_value.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_value_error.result
+share/mysql-test/suite/engines/funcs/r/tc_partition_value_specific.result
+share/mysql-test/suite/engines/funcs/r/tc_rename.result
+share/mysql-test/suite/engines/funcs/r/tc_rename_across_database.result
+share/mysql-test/suite/engines/funcs/r/tc_rename_error.result
+share/mysql-test/suite/engines/funcs/r/tc_structure_comment.result
+share/mysql-test/suite/engines/funcs/r/tc_structure_create_like.result
+share/mysql-test/suite/engines/funcs/r/tc_structure_create_like_string.result
+share/mysql-test/suite/engines/funcs/r/tc_structure_create_select.result
+share/mysql-test/suite/engines/funcs/r/tc_structure_create_select_string.result
+share/mysql-test/suite/engines/funcs/r/tc_structure_string_comment.result
+share/mysql-test/suite/engines/funcs/r/tc_temporary_column.result
+share/mysql-test/suite/engines/funcs/r/tc_temporary_column_length.result
+share/mysql-test/suite/engines/funcs/r/time_function.result
+share/mysql-test/suite/engines/funcs/r/tr_all_type_triggers.result
+share/mysql-test/suite/engines/funcs/r/tr_delete.result
+share/mysql-test/suite/engines/funcs/r/tr_delete_new_error.result
+share/mysql-test/suite/engines/funcs/r/tr_insert.result
+share/mysql-test/suite/engines/funcs/r/tr_insert_after_error.result
+share/mysql-test/suite/engines/funcs/r/tr_insert_old_error.result
+share/mysql-test/suite/engines/funcs/r/tr_update.result
+share/mysql-test/suite/engines/funcs/r/tr_update_after_error.result
+share/mysql-test/suite/engines/funcs/r/up_calendar_range.result
+share/mysql-test/suite/engines/funcs/r/up_ignore.result
+share/mysql-test/suite/engines/funcs/r/up_limit.result
+share/mysql-test/suite/engines/funcs/r/up_multi_db_table.result
+share/mysql-test/suite/engines/funcs/r/up_multi_table.result
+share/mysql-test/suite/engines/funcs/r/up_nullcheck.result
+share/mysql-test/suite/engines/funcs/r/up_number_range.result
+share/mysql-test/suite/engines/funcs/r/up_string_range.result
+share/mysql-test/suite/engines/funcs/t/ai_init_alter_table.test
+share/mysql-test/suite/engines/funcs/t/ai_init_create_table.test
+share/mysql-test/suite/engines/funcs/t/ai_init_insert.test
+share/mysql-test/suite/engines/funcs/t/ai_init_insert_id.test
+share/mysql-test/suite/engines/funcs/t/ai_overflow_error.test
+share/mysql-test/suite/engines/funcs/t/ai_reset_by_truncate.test
+share/mysql-test/suite/engines/funcs/t/ai_sql_auto_is_null.test
+share/mysql-test/suite/engines/funcs/t/an_calendar.test
+share/mysql-test/suite/engines/funcs/t/an_number.test
+share/mysql-test/suite/engines/funcs/t/an_string.test
+share/mysql-test/suite/engines/funcs/t/comment_column.test
+share/mysql-test/suite/engines/funcs/t/comment_column2.test
+share/mysql-test/suite/engines/funcs/t/comment_table.test
+share/mysql-test/suite/engines/funcs/t/crash_manycolumns_number.test
+share/mysql-test/suite/engines/funcs/t/crash_manycolumns_string.test
+share/mysql-test/suite/engines/funcs/t/crash_manyindexes_number.test
+share/mysql-test/suite/engines/funcs/t/crash_manyindexes_string.test
+share/mysql-test/suite/engines/funcs/t/crash_manytables_number.test
+share/mysql-test/suite/engines/funcs/t/crash_manytables_string.test
+share/mysql-test/suite/engines/funcs/t/data1.inc
+share/mysql-test/suite/engines/funcs/t/data2.inc
+share/mysql-test/suite/engines/funcs/t/date_function.test
+share/mysql-test/suite/engines/funcs/t/datetime_function.test
+share/mysql-test/suite/engines/funcs/t/db_alter_character_set.test
+share/mysql-test/suite/engines/funcs/t/db_alter_character_set_collate.test
+share/mysql-test/suite/engines/funcs/t/db_alter_collate_ascii.test
+share/mysql-test/suite/engines/funcs/t/db_alter_collate_utf8.test
+share/mysql-test/suite/engines/funcs/t/db_create_character_set.test
+share/mysql-test/suite/engines/funcs/t/db_create_character_set_collate.test
+share/mysql-test/suite/engines/funcs/t/db_create_drop.test
+share/mysql-test/suite/engines/funcs/t/db_create_error.test
+share/mysql-test/suite/engines/funcs/t/db_create_error_reserved.test
+share/mysql-test/suite/engines/funcs/t/db_create_if_not_exists.test
+share/mysql-test/suite/engines/funcs/t/db_drop_error.test
+share/mysql-test/suite/engines/funcs/t/db_use_error.test
+share/mysql-test/suite/engines/funcs/t/de_autoinc.test
+share/mysql-test/suite/engines/funcs/t/de_calendar_range.test
+share/mysql-test/suite/engines/funcs/t/de_ignore.test
+share/mysql-test/suite/engines/funcs/t/de_limit.test
+share/mysql-test/suite/engines/funcs/t/de_multi_db_table.test
+share/mysql-test/suite/engines/funcs/t/de_multi_db_table_using.test
+share/mysql-test/suite/engines/funcs/t/de_multi_table.test
+share/mysql-test/suite/engines/funcs/t/de_multi_table_using.test
+share/mysql-test/suite/engines/funcs/t/de_number_range.test
+share/mysql-test/suite/engines/funcs/t/de_quick.test
+share/mysql-test/suite/engines/funcs/t/de_string_range.test
+share/mysql-test/suite/engines/funcs/t/de_truncate.test
+share/mysql-test/suite/engines/funcs/t/de_truncate_autoinc.test
+share/mysql-test/suite/engines/funcs/t/disabled.def
+share/mysql-test/suite/engines/funcs/t/fu_aggregate_avg_number.test
+share/mysql-test/suite/engines/funcs/t/fu_aggregate_count_number.test
+share/mysql-test/suite/engines/funcs/t/fu_aggregate_max_number.test
+share/mysql-test/suite/engines/funcs/t/fu_aggregate_max_subquery.test
+share/mysql-test/suite/engines/funcs/t/fu_aggregate_min_number.test
+share/mysql-test/suite/engines/funcs/t/fu_aggregate_sum_number.test
+share/mysql-test/suite/engines/funcs/t/general_no_data.test
+share/mysql-test/suite/engines/funcs/t/general_not_null.test
+share/mysql-test/suite/engines/funcs/t/general_null.test
+share/mysql-test/suite/engines/funcs/t/in_calendar_2_unique_constraints_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_calendar_pk_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_calendar_unique_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_enum_null.test
+share/mysql-test/suite/engines/funcs/t/in_enum_null_boundary_error.test
+share/mysql-test/suite/engines/funcs/t/in_enum_null_large_error.test
+share/mysql-test/suite/engines/funcs/t/in_insert_select.test
+share/mysql-test/suite/engines/funcs/t/in_insert_select_autoinc.test
+share/mysql-test/suite/engines/funcs/t/in_insert_select_unique_violation.test
+share/mysql-test/suite/engines/funcs/t/in_lob_boundary_error.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_pk_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_calendar_unique_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_number_pk_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_number_unique_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_number_unique_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_number_unique_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_number_2_unique_constraints_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_number_boundary_error.test
+share/mysql-test/suite/engines/funcs/t/in_number_decimal_boundary_error.test
+share/mysql-test/suite/engines/funcs/t/in_number_length.test
+share/mysql-test/suite/engines/funcs/t/in_number_null.test
+share/mysql-test/suite/engines/funcs/t/in_number_pk_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_number_pk_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_number_pk_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_number_unique_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_number_unique_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_number_unique_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_set_null.test
+share/mysql-test/suite/engines/funcs/t/in_set_null_boundary_error.test
+share/mysql-test/suite/engines/funcs/t/in_set_null_large.test
+share/mysql-test/suite/engines/funcs/t/in_string_2_unique_constraints_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_string_boundary_error.test
+share/mysql-test/suite/engines/funcs/t/in_string_not_null.test
+share/mysql-test/suite/engines/funcs/t/in_string_null.test
+share/mysql-test/suite/engines/funcs/t/in_string_pk_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_string_pk_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_string_pk_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/in_string_set_enum_fail.test
+share/mysql-test/suite/engines/funcs/t/in_string_unique_constraint_duplicate_update.test
+share/mysql-test/suite/engines/funcs/t/in_string_unique_constraint_error.test
+share/mysql-test/suite/engines/funcs/t/in_string_unique_constraint_ignore.test
+share/mysql-test/suite/engines/funcs/t/ix_drop.test
+share/mysql-test/suite/engines/funcs/t/ix_drop_error.test
+share/mysql-test/suite/engines/funcs/t/ix_index_decimals.test
+share/mysql-test/suite/engines/funcs/t/ix_index_lob.test
+share/mysql-test/suite/engines/funcs/t/ix_index_non_string.test
+share/mysql-test/suite/engines/funcs/t/ix_index_string.test
+share/mysql-test/suite/engines/funcs/t/ix_index_string_length.test
+share/mysql-test/suite/engines/funcs/t/ix_unique_decimals.test
+share/mysql-test/suite/engines/funcs/t/ix_unique_lob.test
+share/mysql-test/suite/engines/funcs/t/ix_unique_non_string.test
+share/mysql-test/suite/engines/funcs/t/ix_unique_string.test
+share/mysql-test/suite/engines/funcs/t/ix_unique_string_length.test
+share/mysql-test/suite/engines/funcs/t/ix_using_order.test
+share/mysql-test/suite/engines/funcs/t/jp_comment_column.test
+share/mysql-test/suite/engines/funcs/t/jp_comment_older_compatibility1.test
+share/mysql-test/suite/engines/funcs/t/jp_comment_table.test
+share/mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test
+share/mysql-test/suite/engines/funcs/t/ld_bit.test
+share/mysql-test/suite/engines/funcs/t/ld_enum_set.test
+share/mysql-test/suite/engines/funcs/t/ld_less_columns.test
+share/mysql-test/suite/engines/funcs/t/ld_more_columns_truncated.test
+share/mysql-test/suite/engines/funcs/t/ld_null.test
+share/mysql-test/suite/engines/funcs/t/ld_quote.test
+share/mysql-test/suite/engines/funcs/t/ld_simple.test
+share/mysql-test/suite/engines/funcs/t/ld_starting.test
+share/mysql-test/suite/engines/funcs/t/ld_unique_error1.test
+share/mysql-test/suite/engines/funcs/t/ld_unique_error1_local.test
+share/mysql-test/suite/engines/funcs/t/ld_unique_error2.test
+share/mysql-test/suite/engines/funcs/t/ld_unique_error2_local.test
+share/mysql-test/suite/engines/funcs/t/ld_unique_error3.test
+share/mysql-test/suite/engines/funcs/t/ld_unique_error3_local.test
+share/mysql-test/suite/engines/funcs/t/load_bit.inc
+share/mysql-test/suite/engines/funcs/t/load_enum_set.inc
+share/mysql-test/suite/engines/funcs/t/load_less_columns.inc
+share/mysql-test/suite/engines/funcs/t/load_more_columns.inc
+share/mysql-test/suite/engines/funcs/t/load_null.inc
+share/mysql-test/suite/engines/funcs/t/load_null2.inc
+share/mysql-test/suite/engines/funcs/t/load_quote.inc
+share/mysql-test/suite/engines/funcs/t/load_simple.inc
+share/mysql-test/suite/engines/funcs/t/load_starting.inc
+share/mysql-test/suite/engines/funcs/t/load_unique_error1.inc
+share/mysql-test/suite/engines/funcs/t/load_unique_error2.inc
+share/mysql-test/suite/engines/funcs/t/load_unique_error3.inc
+share/mysql-test/suite/engines/funcs/t/ps_number_length.test
+share/mysql-test/suite/engines/funcs/t/ps_number_null.test
+share/mysql-test/suite/engines/funcs/t/ps_string_not_null.test
+share/mysql-test/suite/engines/funcs/t/ps_string_null.test
+share/mysql-test/suite/engines/funcs/t/re_number_range.test
+share/mysql-test/suite/engines/funcs/t/re_number_range_set.test
+share/mysql-test/suite/engines/funcs/t/re_number_select.test
+share/mysql-test/suite/engines/funcs/t/re_string_range.test
+share/mysql-test/suite/engines/funcs/t/re_string_range_set.test
+share/mysql-test/suite/engines/funcs/t/rpl000010-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl000010.test
+share/mysql-test/suite/engines/funcs/t/rpl000011.test
+share/mysql-test/suite/engines/funcs/t/rpl000013.test
+share/mysql-test/suite/engines/funcs/t/rpl000017-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl000017.test
+share/mysql-test/suite/engines/funcs/t/rpl_000015.test
+share/mysql-test/suite/engines/funcs/t/rpl_LD_INFILE.test
+share/mysql-test/suite/engines/funcs/t/rpl_REDIRECT.test
+share/mysql-test/suite/engines/funcs/t/rpl_alter.test
+share/mysql-test/suite/engines/funcs/t/rpl_alter_db.test
+share/mysql-test/suite/engines/funcs/t/rpl_bit.test
+share/mysql-test/suite/engines/funcs/t/rpl_bit_npk.test
+share/mysql-test/suite/engines/funcs/t/rpl_change_master.test
+share/mysql-test/suite/engines/funcs/t/rpl_create_database-master.opt
+share/mysql-test/suite/engines/funcs/t/rpl_create_database-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_create_database.test
+share/mysql-test/suite/engines/funcs/t/rpl_do_grant.test
+share/mysql-test/suite/engines/funcs/t/rpl_drop.test
+share/mysql-test/suite/engines/funcs/t/rpl_drop_db.test
+share/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance-master.opt
+share/mysql-test/suite/engines/funcs/t/rpl_dual_pos_advance.test
+share/mysql-test/suite/engines/funcs/t/rpl_empty_master_crash-master.opt
+share/mysql-test/suite/engines/funcs/t/rpl_empty_master_crash.test
+share/mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable.test
+share/mysql-test/suite/engines/funcs/t/rpl_flushlog_loop.test
+share/mysql-test/suite/engines/funcs/t/rpl_free_items-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_free_items.test
+share/mysql-test/suite/engines/funcs/t/rpl_get_lock.test
+share/mysql-test/suite/engines/funcs/t/rpl_ignore_grant-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_ignore_grant.test
+share/mysql-test/suite/engines/funcs/t/rpl_ignore_revoke-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_ignore_revoke.test
+share/mysql-test/suite/engines/funcs/t/rpl_ignore_table_update-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_ignore_table_update.test
+share/mysql-test/suite/engines/funcs/t/rpl_init_slave-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_init_slave.test
+share/mysql-test/suite/engines/funcs/t/rpl_insert.test
+share/mysql-test/suite/engines/funcs/t/rpl_insert_select.test
+share/mysql-test/suite/engines/funcs/t/rpl_loaddata2.test
+share/mysql-test/suite/engines/funcs/t/rpl_loaddata_m-master.opt
+share/mysql-test/suite/engines/funcs/t/rpl_loaddata_m.test
+share/mysql-test/suite/engines/funcs/t/rpl_loaddata_s-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test
+share/mysql-test/suite/engines/funcs/t/rpl_loaddatalocal.test
+share/mysql-test/suite/engines/funcs/t/rpl_loadfile.test
+share/mysql-test/suite/engines/funcs/t/rpl_log_pos.test
+share/mysql-test/suite/engines/funcs/t/rpl_many_optimize.test
+share/mysql-test/suite/engines/funcs/t/rpl_master_pos_wait.test
+share/mysql-test/suite/engines/funcs/t/rpl_misc_functions.test
+share/mysql-test/suite/engines/funcs/t/rpl_multi_delete-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_multi_delete.test
+share/mysql-test/suite/engines/funcs/t/rpl_multi_delete2-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_multi_delete2.test
+share/mysql-test/suite/engines/funcs/t/rpl_multi_update4-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_multi_update4.test
+share/mysql-test/suite/engines/funcs/t/rpl_ps.test
+share/mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test
+share/mysql-test/suite/engines/funcs/t/rpl_relayspace-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_relayspace.test
+share/mysql-test/suite/engines/funcs/t/rpl_replicate_ignore_db-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_replicate_ignore_db.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_NOW.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_USER.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_drop.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_func001.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_row_inexist_tbl.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_sp001.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_sp005.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_sp008.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_sp009.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_sp010.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_sp011.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_sp012.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_stop_middle.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_trig001.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_trig002.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_trig003.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_until.test
+share/mysql-test/suite/engines/funcs/t/rpl_row_view01.test
+share/mysql-test/suite/engines/funcs/t/rpl_server_id1.test
+share/mysql-test/suite/engines/funcs/t/rpl_server_id2-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_server_id2.test
+share/mysql-test/suite/engines/funcs/t/rpl_session_var.test
+share/mysql-test/suite/engines/funcs/t/rpl_sf.test
+share/mysql-test/suite/engines/funcs/t/rpl_skip_error-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_skip_error.test
+share/mysql-test/suite/engines/funcs/t/rpl_slave_status.test
+share/mysql-test/suite/engines/funcs/t/rpl_sp-master.opt
+share/mysql-test/suite/engines/funcs/t/rpl_sp-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_sp.test
+share/mysql-test/suite/engines/funcs/t/rpl_sp004.test
+share/mysql-test/suite/engines/funcs/t/rpl_sp_effects-master.opt
+share/mysql-test/suite/engines/funcs/t/rpl_sp_effects-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_sp_effects.test
+share/mysql-test/suite/engines/funcs/t/rpl_start_stop_slave.test
+share/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test
+share/mysql-test/suite/engines/funcs/t/rpl_stm_mystery22.test
+share/mysql-test/suite/engines/funcs/t/rpl_stm_no_op.test
+share/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test
+share/mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
+share/mysql-test/suite/engines/funcs/t/rpl_temp_table.test
+share/mysql-test/suite/engines/funcs/t/rpl_temporary.test
+share/mysql-test/suite/engines/funcs/t/rpl_trigger.test
+share/mysql-test/suite/engines/funcs/t/rpl_trunc_temp.test
+share/mysql-test/suite/engines/funcs/t/rpl_user_variables.test
+share/mysql-test/suite/engines/funcs/t/rpl_variables-master.opt
+share/mysql-test/suite/engines/funcs/t/rpl_variables.test
+share/mysql-test/suite/engines/funcs/t/rpl_view-slave.opt
+share/mysql-test/suite/engines/funcs/t/rpl_view.test
+share/mysql-test/suite/engines/funcs/t/se_join_cross.test
+share/mysql-test/suite/engines/funcs/t/se_join_default.test
+share/mysql-test/suite/engines/funcs/t/se_join_inner.test
+share/mysql-test/suite/engines/funcs/t/se_join_left.test
+share/mysql-test/suite/engines/funcs/t/se_join_left_outer.test
+share/mysql-test/suite/engines/funcs/t/se_join_natural_left.test
+share/mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test
+share/mysql-test/suite/engines/funcs/t/se_join_natural_right.test
+share/mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test
+share/mysql-test/suite/engines/funcs/t/se_join_right.test
+share/mysql-test/suite/engines/funcs/t/se_join_right_outer.test
+share/mysql-test/suite/engines/funcs/t/se_join_straight.test
+share/mysql-test/suite/engines/funcs/t/se_rowid.test
+share/mysql-test/suite/engines/funcs/t/se_string_distinct.test
+share/mysql-test/suite/engines/funcs/t/se_string_from.test
+share/mysql-test/suite/engines/funcs/t/se_string_groupby.test
+share/mysql-test/suite/engines/funcs/t/se_string_having.test
+share/mysql-test/suite/engines/funcs/t/se_string_limit.test
+share/mysql-test/suite/engines/funcs/t/se_string_orderby.test
+share/mysql-test/suite/engines/funcs/t/se_string_union.test
+share/mysql-test/suite/engines/funcs/t/se_string_where.test
+share/mysql-test/suite/engines/funcs/t/se_string_where_and.test
+share/mysql-test/suite/engines/funcs/t/se_string_where_or.test
+share/mysql-test/suite/engines/funcs/t/sf_alter.test
+share/mysql-test/suite/engines/funcs/t/sf_cursor.test
+share/mysql-test/suite/engines/funcs/t/sf_simple1.test
+share/mysql-test/suite/engines/funcs/t/sp_alter.test
+share/mysql-test/suite/engines/funcs/t/sp_cursor.test
+share/mysql-test/suite/engines/funcs/t/sp_simple1.test
+share/mysql-test/suite/engines/funcs/t/sq_all.test
+share/mysql-test/suite/engines/funcs/t/sq_any.test
+share/mysql-test/suite/engines/funcs/t/sq_corr.test
+share/mysql-test/suite/engines/funcs/t/sq_error.test
+share/mysql-test/suite/engines/funcs/t/sq_exists.test
+share/mysql-test/suite/engines/funcs/t/sq_from.test
+share/mysql-test/suite/engines/funcs/t/sq_in.test
+share/mysql-test/suite/engines/funcs/t/sq_row.test
+share/mysql-test/suite/engines/funcs/t/sq_scalar.test
+share/mysql-test/suite/engines/funcs/t/sq_some.test
+share/mysql-test/suite/engines/funcs/t/ta_2part_column_to_pk.test
+share/mysql-test/suite/engines/funcs/t/ta_2part_diff_string_to_pk.test
+share/mysql-test/suite/engines/funcs/t/ta_2part_diff_to_pk.test
+share/mysql-test/suite/engines/funcs/t/ta_2part_string_to_pk.test
+share/mysql-test/suite/engines/funcs/t/ta_3part_column_to_pk.test
+share/mysql-test/suite/engines/funcs/t/ta_3part_string_to_pk.test
+share/mysql-test/suite/engines/funcs/t/ta_add_column.test
+share/mysql-test/suite/engines/funcs/t/ta_add_column2.test
+share/mysql-test/suite/engines/funcs/t/ta_add_column_first.test
+share/mysql-test/suite/engines/funcs/t/ta_add_column_first2.test
+share/mysql-test/suite/engines/funcs/t/ta_add_column_middle.test
+share/mysql-test/suite/engines/funcs/t/ta_add_column_middle2.test
+share/mysql-test/suite/engines/funcs/t/ta_add_string.test
+share/mysql-test/suite/engines/funcs/t/ta_add_string2.test
+share/mysql-test/suite/engines/funcs/t/ta_add_string_first.test
+share/mysql-test/suite/engines/funcs/t/ta_add_string_first2.test
+share/mysql-test/suite/engines/funcs/t/ta_add_string_middle.test
+share/mysql-test/suite/engines/funcs/t/ta_add_string_middle2.test
+share/mysql-test/suite/engines/funcs/t/ta_add_string_unique_index.test
+share/mysql-test/suite/engines/funcs/t/ta_add_unique_index.test
+share/mysql-test/suite/engines/funcs/t/ta_column_from_unsigned.test
+share/mysql-test/suite/engines/funcs/t/ta_column_from_zerofill.test
+share/mysql-test/suite/engines/funcs/t/ta_column_to_index.test
+share/mysql-test/suite/engines/funcs/t/ta_column_to_not_null.test
+share/mysql-test/suite/engines/funcs/t/ta_column_to_null.test
+share/mysql-test/suite/engines/funcs/t/ta_column_to_pk.test
+share/mysql-test/suite/engines/funcs/t/ta_column_to_unsigned.test
+share/mysql-test/suite/engines/funcs/t/ta_column_to_zerofill.test
+share/mysql-test/suite/engines/funcs/t/ta_drop_column.test
+share/mysql-test/suite/engines/funcs/t/ta_drop_index.test
+share/mysql-test/suite/engines/funcs/t/ta_drop_pk_autoincrement.test
+share/mysql-test/suite/engines/funcs/t/ta_drop_pk_number.test
+share/mysql-test/suite/engines/funcs/t/ta_drop_pk_string.test
+share/mysql-test/suite/engines/funcs/t/ta_drop_string_index.test
+share/mysql-test/suite/engines/funcs/t/ta_orderby.test
+share/mysql-test/suite/engines/funcs/t/ta_rename.test
+share/mysql-test/suite/engines/funcs/t/ta_set_drop_default.test
+share/mysql-test/suite/engines/funcs/t/ta_string_drop_column.test
+share/mysql-test/suite/engines/funcs/t/ta_string_to_index.test
+share/mysql-test/suite/engines/funcs/t/ta_string_to_not_null.test
+share/mysql-test/suite/engines/funcs/t/ta_string_to_null.test
+share/mysql-test/suite/engines/funcs/t/ta_string_to_pk.test
+share/mysql-test/suite/engines/funcs/t/tc_column_autoincrement.test
+share/mysql-test/suite/engines/funcs/t/tc_column_comment.test
+share/mysql-test/suite/engines/funcs/t/tc_column_comment_string.test
+share/mysql-test/suite/engines/funcs/t/tc_column_default_decimal.test
+share/mysql-test/suite/engines/funcs/t/tc_column_default_number.test
+share/mysql-test/suite/engines/funcs/t/tc_column_default_string.test
+share/mysql-test/suite/engines/funcs/t/tc_column_enum.test
+share/mysql-test/suite/engines/funcs/t/tc_column_enum_long.test
+share/mysql-test/suite/engines/funcs/t/tc_column_key.test
+share/mysql-test/suite/engines/funcs/t/tc_column_key_length.test
+share/mysql-test/suite/engines/funcs/t/tc_column_length.test
+share/mysql-test/suite/engines/funcs/t/tc_column_length_decimals.test
+share/mysql-test/suite/engines/funcs/t/tc_column_length_zero.test
+share/mysql-test/suite/engines/funcs/t/tc_column_not_null.test
+share/mysql-test/suite/engines/funcs/t/tc_column_null.test
+share/mysql-test/suite/engines/funcs/t/tc_column_primary_key_number.test
+share/mysql-test/suite/engines/funcs/t/tc_column_primary_key_string.test
+share/mysql-test/suite/engines/funcs/t/tc_column_serial.test
+share/mysql-test/suite/engines/funcs/t/tc_column_set.test
+share/mysql-test/suite/engines/funcs/t/tc_column_set_long.test
+share/mysql-test/suite/engines/funcs/t/tc_column_unique_key.test
+share/mysql-test/suite/engines/funcs/t/tc_column_unique_key_string.test
+share/mysql-test/suite/engines/funcs/t/tc_column_unsigned.test
+share/mysql-test/suite/engines/funcs/t/tc_column_zerofill.test
+share/mysql-test/suite/engines/funcs/t/tc_drop_table.test
+share/mysql-test/suite/engines/funcs/t/tc_multicolumn_different.test
+share/mysql-test/suite/engines/funcs/t/tc_multicolumn_same.test
+share/mysql-test/suite/engines/funcs/t/tc_multicolumn_same_string.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_analyze.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_change_from_range_to_hash_key.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_check.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_hash.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_hash_date_function.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_key.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_linear_key.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_list_directory.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_list_error.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_optimize.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_rebuild.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_remove.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_reorg_divide.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_reorg_hash_key.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_reorg_merge.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_repair.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_sub1.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_sub2.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_value.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_value_error.test
+share/mysql-test/suite/engines/funcs/t/tc_partition_value_specific.test
+share/mysql-test/suite/engines/funcs/t/tc_rename.test
+share/mysql-test/suite/engines/funcs/t/tc_rename_across_database.test
+share/mysql-test/suite/engines/funcs/t/tc_rename_error.test
+share/mysql-test/suite/engines/funcs/t/tc_structure_comment.test
+share/mysql-test/suite/engines/funcs/t/tc_structure_create_like.test
+share/mysql-test/suite/engines/funcs/t/tc_structure_create_like_string.test
+share/mysql-test/suite/engines/funcs/t/tc_structure_create_select.test
+share/mysql-test/suite/engines/funcs/t/tc_structure_create_select_string.test
+share/mysql-test/suite/engines/funcs/t/tc_structure_string_comment.test
+share/mysql-test/suite/engines/funcs/t/tc_temporary_column.test
+share/mysql-test/suite/engines/funcs/t/tc_temporary_column_length.test
+share/mysql-test/suite/engines/funcs/t/time_function.test
+share/mysql-test/suite/engines/funcs/t/tr_all_type_triggers.test
+share/mysql-test/suite/engines/funcs/t/tr_delete.test
+share/mysql-test/suite/engines/funcs/t/tr_delete_new_error.test
+share/mysql-test/suite/engines/funcs/t/tr_insert.test
+share/mysql-test/suite/engines/funcs/t/tr_insert_after_error.test
+share/mysql-test/suite/engines/funcs/t/tr_insert_old_error.test
+share/mysql-test/suite/engines/funcs/t/tr_update.test
+share/mysql-test/suite/engines/funcs/t/tr_update_after_error.test
+share/mysql-test/suite/engines/funcs/t/up_calendar_range.test
+share/mysql-test/suite/engines/funcs/t/up_ignore.test
+share/mysql-test/suite/engines/funcs/t/up_limit.test
+share/mysql-test/suite/engines/funcs/t/up_multi_db_table.test
+share/mysql-test/suite/engines/funcs/t/up_multi_table.test
+share/mysql-test/suite/engines/funcs/t/up_nullcheck.test
+share/mysql-test/suite/engines/funcs/t/up_number_range.test
+share/mysql-test/suite/engines/funcs/t/up_string_range.test
+share/mysql-test/suite/engines/funcs/t/wait_show_pattern.inc
+share/mysql-test/suite/engines/funcs/t/wait_slave_status.inc
+share/mysql-test/suite/engines/iuds/r/delete_decimal.result
+share/mysql-test/suite/engines/iuds/r/delete_time.result
+share/mysql-test/suite/engines/iuds/r/delete_year.result
+share/mysql-test/suite/engines/iuds/r/insert_calendar.result
+share/mysql-test/suite/engines/iuds/r/insert_decimal.result
+share/mysql-test/suite/engines/iuds/r/insert_number.result
+share/mysql-test/suite/engines/iuds/r/insert_time.result
+share/mysql-test/suite/engines/iuds/r/insert_year.result
+share/mysql-test/suite/engines/iuds/r/strings_charsets_update_delete.result
+share/mysql-test/suite/engines/iuds/r/strings_update_delete.result
+share/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
+share/mysql-test/suite/engines/iuds/r/update_decimal.result
+share/mysql-test/suite/engines/iuds/r/update_delete_calendar.result
+share/mysql-test/suite/engines/iuds/r/update_delete_number.result
+share/mysql-test/suite/engines/iuds/r/update_time.result
+share/mysql-test/suite/engines/iuds/r/update_year.result
+share/mysql-test/suite/engines/iuds/t/delete_decimal.test
+share/mysql-test/suite/engines/iuds/t/delete_time.test
+share/mysql-test/suite/engines/iuds/t/delete_year.test
+share/mysql-test/suite/engines/iuds/t/disabled.def
+share/mysql-test/suite/engines/iuds/t/hindi.txt
+share/mysql-test/suite/engines/iuds/t/insert_calendar.test
+share/mysql-test/suite/engines/iuds/t/insert_decimal.test
+share/mysql-test/suite/engines/iuds/t/insert_number.test
+share/mysql-test/suite/engines/iuds/t/insert_time.test
+share/mysql-test/suite/engines/iuds/t/insert_year.test
+share/mysql-test/suite/engines/iuds/t/sample.txt
+share/mysql-test/suite/engines/iuds/t/strings_charsets_update_delete.test
+share/mysql-test/suite/engines/iuds/t/strings_update_delete.test
+share/mysql-test/suite/engines/iuds/t/type_bit_iuds.test
+share/mysql-test/suite/engines/iuds/t/update_decimal.test
+share/mysql-test/suite/engines/iuds/t/update_delete_calendar.test
+share/mysql-test/suite/engines/iuds/t/update_delete_number.test
+share/mysql-test/suite/engines/iuds/t/update_time.test
+share/mysql-test/suite/engines/iuds/t/update_year.test
+share/mysql-test/suite/engines/rr_trx/check_consistency.sql
+share/mysql-test/suite/engines/rr_trx/include/check_for_error_rollback.inc
+share/mysql-test/suite/engines/rr_trx/include/check_for_error_rollback_skip.inc
+share/mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc
+share/mysql-test/suite/engines/rr_trx/include/record_query_all_columns.inc
+share/mysql-test/suite/engines/rr_trx/include/rr_init.test
+share/mysql-test/suite/engines/rr_trx/init_innodb.txt
+share/mysql-test/suite/engines/rr_trx/r/init_innodb.result
+share/mysql-test/suite/engines/rr_trx/r/rr_c_count_not_zero.result
+share/mysql-test/suite/engines/rr_trx/r/rr_c_stats.result
+share/mysql-test/suite/engines/rr_trx/r/rr_i_40-44.result
+share/mysql-test/suite/engines/rr_trx/r/rr_id_3.result
+share/mysql-test/suite/engines/rr_trx/r/rr_id_900.result
+share/mysql-test/suite/engines/rr_trx/r/rr_insert_select_2.result
+share/mysql-test/suite/engines/rr_trx/r/rr_iud_rollback-multi-50.result
+share/mysql-test/suite/engines/rr_trx/r/rr_replace_7-8.result
+share/mysql-test/suite/engines/rr_trx/r/rr_s_select-uncommitted.result
+share/mysql-test/suite/engines/rr_trx/r/rr_sc_select-limit-nolimit_4.result
+share/mysql-test/suite/engines/rr_trx/r/rr_sc_select-same_2.result
+share/mysql-test/suite/engines/rr_trx/r/rr_sc_sum_total.result
+share/mysql-test/suite/engines/rr_trx/r/rr_u_10-19.result
+share/mysql-test/suite/engines/rr_trx/r/rr_u_10-19_nolimit.result
+share/mysql-test/suite/engines/rr_trx/r/rr_u_4.result
+share/mysql-test/suite/engines/rr_trx/run.txt
+share/mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
+share/mysql-test/suite/engines/rr_trx/t/init_innodb.test
+share/mysql-test/suite/engines/rr_trx/t/rr_c_count_not_zero.test
+share/mysql-test/suite/engines/rr_trx/t/rr_c_stats.test
+share/mysql-test/suite/engines/rr_trx/t/rr_i_40-44.test
+share/mysql-test/suite/engines/rr_trx/t/rr_id_3.test
+share/mysql-test/suite/engines/rr_trx/t/rr_id_900.test
+share/mysql-test/suite/engines/rr_trx/t/rr_insert_select_2.test
+share/mysql-test/suite/engines/rr_trx/t/rr_iud_rollback-multi-50.test
+share/mysql-test/suite/engines/rr_trx/t/rr_replace_7-8.test
+share/mysql-test/suite/engines/rr_trx/t/rr_s_select-uncommitted.test
+share/mysql-test/suite/engines/rr_trx/t/rr_sc_select-limit-nolimit_4.test
+share/mysql-test/suite/engines/rr_trx/t/rr_sc_select-same_2.test
+share/mysql-test/suite/engines/rr_trx/t/rr_sc_sum_total.test
+share/mysql-test/suite/engines/rr_trx/t/rr_u_10-19.test
+share/mysql-test/suite/engines/rr_trx/t/rr_u_10-19_nolimit.test
+share/mysql-test/suite/engines/rr_trx/t/rr_u_4.test
 share/mysql-test/suite/federated/disabled.def
 share/mysql-test/suite/federated/federated.inc
 share/mysql-test/suite/federated/federated.result
@@ -1691,45 +2599,61 @@ 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/ndb_charset.test
 share/mysql-test/suite/funcs_2/t/suite.opt
-share/mysql-test/suite/innodb/include/have_innodb_plugin.inc
-share/mysql-test/suite/innodb/include/innodb-index.inc
-share/mysql-test/suite/innodb/r/innodb-analyze.result
-share/mysql-test/suite/innodb/r/innodb-consistent.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-timeout.result
-share/mysql-test/suite/innodb/r/innodb-use-sys-malloc.result
-share/mysql-test/suite/innodb/r/innodb-zip.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_bug40360.result
-share/mysql-test/suite/innodb/r/innodb_bug41904.result
-share/mysql-test/suite/innodb/r/innodb_bug44032.result
-share/mysql-test/suite/innodb/r/innodb_bug44571.result
-share/mysql-test/suite/innodb/r/innodb_bug46676.result
-share/mysql-test/suite/innodb/r/innodb_bug47167.result
-share/mysql-test/suite/innodb/r/innodb_file_format.result
-share/mysql-test/suite/innodb/r/innodb_information_schema.result
+share/mysql-test/suite/innodb/r/innodb-autoinc-44030.result
+share/mysql-test/suite/innodb/r/innodb-autoinc.result
+share/mysql-test/suite/innodb/r/innodb-lock.result
+share/mysql-test/suite/innodb/r/innodb-replace.result
+share/mysql-test/suite/innodb/r/innodb-semi-consistent.result
+share/mysql-test/suite/innodb/r/innodb.result
+share/mysql-test/suite/innodb/r/innodb_bug21704.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_bug38231.result
+share/mysql-test/suite/innodb/r/innodb_bug39438.result
+share/mysql-test/suite/innodb/r/innodb_bug40565.result
+share/mysql-test/suite/innodb/r/innodb_bug42101-nonzero.result
+share/mysql-test/suite/innodb/r/innodb_bug42101.result
+share/mysql-test/suite/innodb/r/innodb_bug44369.result
+share/mysql-test/suite/innodb/r/innodb_bug45357.result
+share/mysql-test/suite/innodb/r/innodb_bug46000.result
+share/mysql-test/suite/innodb/r/innodb_bug47621.result
+share/mysql-test/suite/innodb/r/innodb_bug47777.result
+share/mysql-test/suite/innodb/r/innodb_bug51920.result
+share/mysql-test/suite/innodb/r/innodb_bug52663.result
+share/mysql-test/suite/innodb/r/innodb_misc1.result
+share/mysql-test/suite/innodb/r/innodb_trx_weight.result
 share/mysql-test/suite/innodb/t/disabled.def
-share/mysql-test/suite/innodb/t/innodb-analyze.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-index.test
-share/mysql-test/suite/innodb/t/innodb-index_ucs2.test
-share/mysql-test/suite/innodb/t/innodb-timeout.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-zip.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_bug40360.test
-share/mysql-test/suite/innodb/t/innodb_bug41904.test
-share/mysql-test/suite/innodb/t/innodb_bug44032.test
-share/mysql-test/suite/innodb/t/innodb_bug44571.test
-share/mysql-test/suite/innodb/t/innodb_bug46676.test
-share/mysql-test/suite/innodb/t/innodb_bug47167.test
-share/mysql-test/suite/innodb/t/innodb_file_format.test
-share/mysql-test/suite/innodb/t/innodb_information_schema.test
+share/mysql-test/suite/innodb/t/innodb-autoinc-44030.test
+share/mysql-test/suite/innodb/t/innodb-autoinc.test
+share/mysql-test/suite/innodb/t/innodb-lock.test
+share/mysql-test/suite/innodb/t/innodb-master.opt
+share/mysql-test/suite/innodb/t/innodb-replace.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.test
+share/mysql-test/suite/innodb/t/innodb_bug21704.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_bug38231.test
+share/mysql-test/suite/innodb/t/innodb_bug39438-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug39438.test
+share/mysql-test/suite/innodb/t/innodb_bug40565.test
+share/mysql-test/suite/innodb/t/innodb_bug42101-nonzero-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test
+share/mysql-test/suite/innodb/t/innodb_bug42101.test
+share/mysql-test/suite/innodb/t/innodb_bug44369.test
+share/mysql-test/suite/innodb/t/innodb_bug45357.test
+share/mysql-test/suite/innodb/t/innodb_bug46000.test
+share/mysql-test/suite/innodb/t/innodb_bug47621.test
+share/mysql-test/suite/innodb/t/innodb_bug47777.test
+share/mysql-test/suite/innodb/t/innodb_bug51920.test
+share/mysql-test/suite/innodb/t/innodb_bug52663-master.opt
+share/mysql-test/suite/innodb/t/innodb_bug52663.test
+share/mysql-test/suite/innodb/t/innodb_misc1-master.opt
+share/mysql-test/suite/innodb/t/innodb_misc1.test
+share/mysql-test/suite/innodb/t/innodb_trx_weight.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
@@ -2605,6 +3529,7 @@ share/mysql-test/suite/rpl/r/rpl_set_charset.result
 share/mysql-test/suite/rpl/r/rpl_set_null_innodb.result
 share/mysql-test/suite/rpl/r/rpl_set_null_myisam.result
 share/mysql-test/suite/rpl/r/rpl_sf.result
+share/mysql-test/suite/rpl/r/rpl_show_slave_running.result
 share/mysql-test/suite/rpl/r/rpl_skip_error.result
 share/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result
 share/mysql-test/suite/rpl/r/rpl_slave_load_in.result
@@ -2634,6 +3559,7 @@ share/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
 share/mysql-test/suite/rpl/r/rpl_stm_multi_query.result
 share/mysql-test/suite/rpl/r/rpl_stm_no_op.result
 share/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
+share/mysql-test/suite/rpl/r/rpl_stm_sql_mode.result
 share/mysql-test/suite/rpl/r/rpl_stm_until.result
 share/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
 share/mysql-test/suite/rpl/r/rpl_temp_table.result
@@ -2646,6 +3572,7 @@ share/mysql-test/suite/rpl/r/rpl_trigger.result
 share/mysql-test/suite/rpl/r/rpl_trunc_temp.result
 share/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
 share/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
+share/mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
 share/mysql-test/suite/rpl/r/rpl_udf.result
 share/mysql-test/suite/rpl/r/rpl_user.result
 share/mysql-test/suite/rpl/r/rpl_user_variables.result
@@ -2672,6 +3599,7 @@ share/mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
 share/mysql-test/suite/rpl/t/rpl_auto_increment.test
 share/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
 share/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
+share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
 share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
 share/mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
@@ -2926,6 +3854,7 @@ share/mysql-test/suite/rpl/t/rpl_set_charset.test
 share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
 share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
 share/mysql-test/suite/rpl/t/rpl_sf.test
+share/mysql-test/suite/rpl/t/rpl_show_slave_running.test
 share/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
 share/mysql-test/suite/rpl/t/rpl_skip_error.test
 share/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
@@ -2968,6 +3897,7 @@ share/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
 share/mysql-test/suite/rpl/t/rpl_stm_multi_query.test
 share/mysql-test/suite/rpl/t/rpl_stm_no_op.test
 share/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
+share/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
 share/mysql-test/suite/rpl/t/rpl_stm_until.test
 share/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
 share/mysql-test/suite/rpl/t/rpl_temp_table.test
@@ -2983,6 +3913,8 @@ share/mysql-test/suite/rpl/t/rpl_trigger.test
 share/mysql-test/suite/rpl/t/rpl_trunc_temp.test
 share/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test
 share/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
+share/mysql-test/suite/rpl/t/rpl_typeconv-slave.opt
+share/mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
 share/mysql-test/suite/rpl/t/rpl_udf-master.opt
 share/mysql-test/suite/rpl/t/rpl_udf-slave.opt
 share/mysql-test/suite/rpl/t/rpl_udf.test
@@ -3159,6 +4091,8 @@ share/mysql-test/t/bootstrap.test
 share/mysql-test/t/bug39022.test
 share/mysql-test/t/bug46080-master.opt
 share/mysql-test/t/bug46080.test
+share/mysql-test/t/bug46261-master.opt
+share/mysql-test/t/bug46261.test
 share/mysql-test/t/bug46760-master.opt
 share/mysql-test/t/bug46760.test
 share/mysql-test/t/bug47671-master.opt
@@ -3354,36 +4288,13 @@ share/mysql-test/t/init_connect-master.opt
 share/mysql-test/t/init_connect.test
 share/mysql-test/t/init_file-master.opt
 share/mysql-test/t/init_file.test
-share/mysql-test/t/innodb-autoinc-44030.test
 share/mysql-test/t/innodb-autoinc-optimize.test
-share/mysql-test/t/innodb-autoinc.test
-share/mysql-test/t/innodb-lock.test
-share/mysql-test/t/innodb-master.opt
-share/mysql-test/t/innodb-replace.test
-share/mysql-test/t/innodb-semi-consistent-master.opt
-share/mysql-test/t/innodb-semi-consistent.test
 share/mysql-test/t/innodb-ucs2.test
-share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt
 share/mysql-test/t/innodb_autoinc_lock_mode_zero.test
-share/mysql-test/t/innodb_bug21704.test
 share/mysql-test/t/innodb_bug30919-master.opt
 share/mysql-test/t/innodb_bug30919.test
-share/mysql-test/t/innodb_bug34053.test
-share/mysql-test/t/innodb_bug34300.test
-share/mysql-test/t/innodb_bug35220.test
-share/mysql-test/t/innodb_bug38231.test
-share/mysql-test/t/innodb_bug39438-master.opt
-share/mysql-test/t/innodb_bug39438.test
-share/mysql-test/t/innodb_bug40565.test
-share/mysql-test/t/innodb_bug42101-nonzero-master.opt
-share/mysql-test/t/innodb_bug42101-nonzero.test
-share/mysql-test/t/innodb_bug42101.test
 share/mysql-test/t/innodb_bug42419.test
-share/mysql-test/t/innodb_bug44369.test
-share/mysql-test/t/innodb_bug45357.test
-share/mysql-test/t/innodb_bug46000.test
-share/mysql-test/t/innodb_bug47777.test
 share/mysql-test/t/innodb_gis.test
 share/mysql-test/t/innodb_ignore_builtin-master.opt
 share/mysql-test/t/innodb_ignore_builtin.test
@@ -3396,7 +4307,6 @@ share/mysql-test/t/innodb_mysql_rbk.test
 share/mysql-test/t/innodb_notembedded.test
 share/mysql-test/t/innodb_timeout_rollback-master.opt
 share/mysql-test/t/innodb_timeout_rollback.test
-share/mysql-test/t/innodb_trx_weight.test
 share/mysql-test/t/insert.test
 share/mysql-test/t/insert_notembedded.test
 share/mysql-test/t/insert_select.test
@@ -3430,6 +4340,7 @@ share/mysql-test/t/log_tables-big.test
 share/mysql-test/t/log_tables-master.opt
 share/mysql-test/t/log_tables.test
 share/mysql-test/t/log_tables_debug.test
+share/mysql-test/t/log_tables_upgrade.test
 share/mysql-test/t/long_tmpdir-master.opt
 share/mysql-test/t/long_tmpdir-master.sh
 share/mysql-test/t/long_tmpdir.test
@@ -3580,6 +4491,8 @@ share/mysql-test/t/plugin-master.opt
 share/mysql-test/t/plugin.test
 share/mysql-test/t/plugin_load-master.opt
 share/mysql-test/t/plugin_load.test
+share/mysql-test/t/plugin_not_embedded-master.opt
+share/mysql-test/t/plugin_not_embedded.test
 share/mysql-test/t/preload.test
 share/mysql-test/t/profiling.test
 share/mysql-test/t/ps-master.opt
@@ -3741,6 +4654,7 @@ share/mysql-test/t/variables.test
 share/mysql-test/t/variables_community.test
 share/mysql-test/t/variables_debug.test
 share/mysql-test/t/view.test
+share/mysql-test/t/view_alias.test
 share/mysql-test/t/view_grant.test
 share/mysql-test/t/wait_timeout.test
 share/mysql-test/t/warnings-master.opt
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index dbe74ca7459..eab951e9dc0 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2.2.2 2010/05/09 13:00:25 tron Exp $
+$NetBSD: distinfo,v 1.2.2.3 2010/05/26 17:13:53 tron Exp $
 
-SHA1 (mysql-5.1.45.tar.gz) = 2a34650dc1a7e056788882522211d07791e0b352
-RMD160 (mysql-5.1.45.tar.gz) = 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba
-Size (mysql-5.1.45.tar.gz) = 22457274 bytes
+SHA1 (mysql-5.1.47.tar.gz) = 9ea8b2cfedb366b884eaeb37757de1cdbbd85b45
+RMD160 (mysql-5.1.47.tar.gz) = ee399fe1ba393c9cd4c19ec43ccea68a6a9f43e3
+Size (mysql-5.1.47.tar.gz) = 23817441 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
@@ -23,6 +23,6 @@ SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae
 SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
 SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
 SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
-SHA1 (patch-av) = 3fb1d881f7d88a72a84abd28d269236b1a84164e
 SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
 SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
+SHA1 (patch-ay) = df6c75d7a1b27a046dac7467fb5e44be4e35281c
diff --git a/databases/mysql51-server/patches/patch-av b/databases/mysql51-server/patches/patch-av
deleted file mode 100644
index 96f6b8ae89d..00000000000
--- a/databases/mysql51-server/patches/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-av,v 1.1.2.2 2010/04/21 06:30:05 spz Exp $
-
-Security fix for http://secunia.com/advisories/39454/.
-
---- sql/sql_plugin.cc.orig	2010-03-01 19:33:41.000000000 +0000
-+++ sql/sql_plugin.cc
-@@ -1736,6 +1736,8 @@ bool mysql_uninstall_plugin(THD *thd, co
-   bzero(&tables, sizeof(tables));
-   tables.db= (char *)"mysql";
-   tables.table_name= tables.alias= (char *)"plugin";
-+  if (check_table_access(thd, DELETE_ACL, &tables, 1, FALSE))
-+    DBUG_RETURN(TRUE);
- 
-   /* need to open before acquiring LOCK_plugin or it will deadlock */
-   if (! (table= open_ltable(thd, &tables, TL_WRITE, 0)))
diff --git a/databases/mysql51-server/patches/patch-ay b/databases/mysql51-server/patches/patch-ay
new file mode 100644
index 00000000000..f7ccb9df63f
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ay
@@ -0,0 +1,22 @@
+$NetBSD: patch-ay,v 1.1.2.2 2010/05/26 17:13:53 tron Exp $
+
+Fix build problem.
+
+--- sql/sql_connect.cc.orig	2010-05-06 15:27:31.000000000 +0000
++++ sql/sql_connect.cc
+@@ -471,6 +471,7 @@ check_user(THD *thd, enum enum_server_co
+       }
+       my_ok(thd);
+       thd->password= test(passwd_len);          // remember for error messages 
++#ifndef EMBEDDED_LIBRARY
+       /*
+         Allow the network layer to skip big packets. Although a malicious
+         authenticated session might use this to trick the server to read
+@@ -478,6 +479,7 @@ check_user(THD *thd, enum enum_server_co
+         that needs to be preserved as to not break backwards compatibility.
+       */
+       thd->net.skip_big_packet= TRUE;
++#endif
+       /* Ready to handle queries */
+       DBUG_RETURN(0);
+     }