Upgrade to MySQL 5.0.67.

Tested by sthen@ on amd64/sparc64.

databases/mysql/Makefile

@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.142 2008/07/25 20:25:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.143 2008/08/24 08:40:02 brad Exp $
 
 COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite)
 
-VERSION=	5.0.51a
+VERSION=	5.0.67
 DISTNAME=	mysql-${VERSION}
-PKGNAME-main=	mysql-client-${VERSION}p0
+PKGNAME-main=	mysql-client-${VERSION}
-PKGNAME-server=	mysql-server-${VERSION}p1
+PKGNAME-server=	mysql-server-${VERSION}
 PKGNAME-tests= 	mysql-tests-${VERSION}
 CATEGORIES=	databases
 V=		MySQL-5.0
-SHARED_LIBS +=	mysqlclient_r        19.0     # .15.0
+SHARED_LIBS +=	mysqlclient_r		19.0
-SHARED_LIBS +=	mysqlclient          19.0     # .15.0
+SHARED_LIBS +=	mysqlclient		19.0
 
 MASTER_SITES=	http://mysql.serenitynet.com/Downloads/$V/
 
@@ -20,7 +20,7 @@ HOMEPAGE=	http://www.mysql.com/
 
 MAINTAINER=	Brad Smith <brad@comstyle.com>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -29,7 +29,7 @@ WANTLIB=		c crypto m pthread ssl z
 
 DB_DIR?=	/var/mysql
 SOCKET_DIR=	/var/run/mysql
-SUBST_VARS=	DB_DIR SOCKET_DIR VERSION
+SUBST_VARS=	DB_DIR SOCKET_DIR TRUEPREFIX VERSION
 
 # XXX gcc bug, gcc/3.3.5
 .if ${MACHINE_ARCH} == "alpha"
@@ -95,14 +95,13 @@ WANTLIB-tests=
 MAKE_FLAGS=	mkdir_p='mkdir -p --'
 
 post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql
 	cd ${PREFIX}/lib && \
 		ln -sf mysql/libmysqlclient.so.${LIBmysqlclient_VERSION} . && \
 		ln -sf mysql/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION} .
-	sed -e s,@PREFIX@,${TRUEPREFIX},g ${FILESDIR}/README.OpenBSD > \
+	cp ${FILESDIR}/README.OpenBSD ${WRKBUILD}/README.OpenBSD
-		${WRKBUILD}/README.OpenBSD
+	${SUBST_CMD} ${WRKBUILD}/README.OpenBSD
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql
 	${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD ${PREFIX}/share/doc/mysql
-	${INSTALL_DATA_DIR} ${PREFIX}/info
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
 do-regress:

databases/mysql/distinfo

@@ -1,5 +1,5 @@
-MD5 (mysql-5.0.51a.tar.gz) = qD29u5Emfa9z0il6nCg90Q==
+MD5 (mysql-5.0.67.tar.gz) = cWRIOl/7j3qlm3YcE829bg==
-RMD160 (mysql-5.0.51a.tar.gz) = hpdUFQ6kLy+6029365oOe7bjiSs=
+RMD160 (mysql-5.0.67.tar.gz) = BdOKX42Ry02sHuRGr5aygWO9NyI=
-SHA1 (mysql-5.0.51a.tar.gz) = rcg7yubQT8zWNg3DqjfGSqpHmj0=
+SHA1 (mysql-5.0.67.tar.gz) = FoCQpGmKOl76LyyTgKQ1LUQz03c=
-SHA256 (mysql-5.0.51a.tar.gz) = WbBvapSEMMclR2DgvxbxRH7hTQFCBz9Y/S5owyczC2g=
+SHA256 (mysql-5.0.67.tar.gz) = e2TmCYSf9k8vy4KityiD95rciT6fb8DTVGXvfZdUIFg=
-SIZE (mysql-5.0.51a.tar.gz) = 27588558
+SIZE (mysql-5.0.67.tar.gz) = 28370810

databases/mysql/files/README.OpenBSD

@@ -2,10 +2,10 @@ Using MySQL in an OpenBSD environment
 
 If you are installing MySQL for the first time, you have to create
 a default database first. In order to create the database, please run
-@PREFIX@/bin/mysql_install_db
+${TRUEPREFIX}/bin/mysql_install_db
 
 You will need to tune the values in the my.cnf file (examples
-available in @PREFIX@/share/mysql).
+available in ${TRUEPREFIX}/share/mysql).
 
 By default, the _mysql user, and so the mysqld processes run in
 the login(1) class of "daemon". On a busy server, it may be advisable
@@ -25,12 +25,12 @@ Rebuild the login.conf.db file if necessary:
 
 And start the server like this:
 
-	if [ -x @PREFIX@/bin/mysqld_safe ] ; then
+	if [ -x ${TRUEPREFIX}/bin/mysqld_safe ] ; then
-		su -c mysql root -c '@PREFIX@/bin/mysqld_safe >/dev/null 2>&1 &' 
+		su -c mysql root -c '${TRUEPREFIX}/bin/mysqld_safe >/dev/null 2>&1 &' 
 		echo -n ' mysql'
 	fi
 
-mysqld_safe(1) is the recommended way to start a mysqld server,
+mysqld_safe(1) is the recommended way to start a MySQL server,
 it creates the directory for the socket and adds some safety
 features such as restarting the server when an error occurs
 and logging runtime information to an error log file. Options

databases/mysql/patches/patch-configure_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.23 2007/08/08 21:33:51 robert Exp $
+$OpenBSD: patch-configure_in,v 1.24 2008/08/24 08:40:03 brad Exp $
---- configure.in.orig	Wed Jul  4 09:06:08 2007
+--- configure.in.orig	Mon Aug  4 08:19:07 2008
-+++ configure.in	Sat Jul 14 16:21:38 2007
++++ configure.in	Fri Aug  8 17:21:01 2008
-@@ -489,48 +489,11 @@ then
+@@ -504,48 +504,11 @@ then
  fi
  AC_SUBST(ICHECK)
  
@@ -52,7 +52,7 @@ $OpenBSD: patch-configure_in,v 1.23 2007/08/08 21:33:51 robert Exp $
  AC_SUBST(FIND_PROC)
  AC_MSG_RESULT("$FIND_PROC")
  
-@@ -864,7 +827,8 @@ AC_ARG_WITH(libwrap,
+@@ -907,7 +870,8 @@ AC_ARG_WITH(libwrap,
      AC_CHECK_HEADER(tcpd.h,
        LIBS="-lwrap $LIBS"
        AC_MSG_CHECKING(for TCP wrappers library -lwrap)
@@ -62,7 +62,7 @@ $OpenBSD: patch-configure_in,v 1.23 2007/08/08 21:33:51 robert Exp $
  int allow_severity = 0;
  int deny_severity  = 0;
  
-@@ -1632,7 +1596,7 @@ then
+@@ -1675,7 +1639,7 @@ then
    AC_CHECK_LIB(c_r,strtok_r)
    case "$with_osf32_threads---$target_os" in
      # Don't keep -lc_r in LIBS; -pthread handles it magically
@@ -71,7 +71,7 @@ $OpenBSD: patch-configure_in,v 1.23 2007/08/08 21:33:51 robert Exp $
  
    esac
    AC_CHECK_FUNCS(strtok_r pthread_init)
-@@ -1680,29 +1644,6 @@ case $SYSTEM_TYPE in
+@@ -1723,29 +1687,6 @@ case $SYSTEM_TYPE in
  AC_SYS_RESTARTABLE_SYSCALLS
      ;;
  esac

databases/mysql/patches/patch-mysql-test_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-mysql-test_Makefile_in,v 1.16 2008/01/18 20:31:17 merdely Exp $
+$OpenBSD: patch-mysql-test_Makefile_in,v 1.17 2008/08/24 08:40:03 brad Exp $
---- mysql-test/Makefile.in.orig	Thu Nov 15 09:08:22 2007
+--- mysql-test/Makefile.in.orig	Mon Aug  4 08:22:09 2008
-+++ mysql-test/Makefile.in	Thu Dec  6 17:55:13 2007
++++ mysql-test/Makefile.in	Fri Aug  8 17:21:01 2008
-@@ -366,7 +366,7 @@ zlib_dir = @zlib_dir@
+@@ -370,7 +370,7 @@ zlib_dir = @zlib_dir@
  @HAVE_NDBCLUSTER_DB_TRUE@DIST_SUBDIRS = ndb
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"

databases/mysql/patches/patch-mysql-test_mysql-test-run-shell_sh

@@ -1,7 +1,7 @@
-$OpenBSD: patch-mysql-test_mysql-test-run-shell_sh,v 1.1 2007/01/25 07:41:48 jakob Exp $
+$OpenBSD: patch-mysql-test_mysql-test-run-shell_sh,v 1.2 2008/08/24 08:40:03 brad Exp $
---- mysql-test/mysql-test-run-shell.sh.orig	Sun Jan 14 21:30:07 2007
+--- mysql-test/mysql-test-run-shell.sh.orig	Mon Aug  4 08:19:21 2008
-+++ mysql-test/mysql-test-run-shell.sh	Sun Jan 14 21:30:20 2007
++++ mysql-test/mysql-test-run-shell.sh	Fri Aug  8 17:21:01 2008
-@@ -101,7 +101,6 @@ sleep_until_file_created ()
+@@ -110,7 +110,6 @@ sleep_until_file_created ()
      loop=`expr $loop - 1`
    done
    echo "ERROR: $file was not created in $org_time seconds;  Aborting"

databases/mysql/patches/patch-scripts_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-scripts_Makefile_in,v 1.9 2007/08/08 21:33:51 robert Exp $
+$OpenBSD: patch-scripts_Makefile_in,v 1.10 2008/08/24 08:40:03 brad Exp $
---- scripts/Makefile.in.orig	Wed Jul  4 09:10:00 2007
+--- scripts/Makefile.in.orig	Mon Aug  4 08:22:27 2008
-+++ scripts/Makefile.in	Sat Jul 14 16:19:38 2007
++++ scripts/Makefile.in	Fri Aug  8 17:21:01 2008
-@@ -786,6 +786,7 @@ mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix
+@@ -793,6 +793,7 @@ mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix
  	  -e 's!@''datadir''@!$(datadir)!g' \
  	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
  	  -e 's!@''libexecdir''@!$(libexecdir)!g' \

databases/mysql/patches/patch-scripts_mysql_install_db_sh

@@ -1,6 +1,6 @@
-$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.9 2008/01/18 20:31:17 merdely Exp $
+$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.10 2008/08/24 08:40:03 brad Exp $
---- scripts/mysql_install_db.sh.orig	Thu Nov 15 09:06:33 2007
+--- scripts/mysql_install_db.sh.orig	Mon Aug  4 08:20:02 2008
-+++ scripts/mysql_install_db.sh	Thu Dec  6 18:15:43 2007
++++ scripts/mysql_install_db.sh	Fri Aug  8 17:22:43 2008
 @@ -25,7 +25,8 @@ srcdir=""
  args=""
  defaults=""
@@ -20,7 +20,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.9 2008/01/18 20:31:17 merdely Ex
        --skip-name-resolve) ip_only=1 ;;
        --verbose) verbose=1 ;; # Obsolete
        --rpm) in_rpm=1 ;;
-@@ -320,7 +323,7 @@ do
+@@ -321,7 +324,7 @@ do
    fi
    if test -w / -a ! -z "$user"
    then
@@ -29,7 +29,7 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.9 2008/01/18 20:31:17 merdely Ex
    fi
  done
  
-@@ -354,11 +357,6 @@ then
+@@ -364,11 +367,6 @@ then
      echo
    fi
  
@@ -38,10 +38,10 @@ $OpenBSD: patch-scripts_mysql_install_db_sh,v 1.9 2008/01/18 20:31:17 merdely Ex
 -  s_echo "support-files/mysql.server to the right place for your system"
 -  s_echo
 -
-   if test "$windows" -eq 0
+   if test "$cross_bootstrap" -eq 0
    then
-     # A root password should of course also be set on Windows!
+     # This is not a true installation on a running system.  The end user must
-@@ -381,16 +379,6 @@ then
+@@ -389,16 +387,6 @@ then
      echo
      echo "See the manual for more instructions."
      echo

databases/mysql/patches/patch-sql_mysqld_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-sql_mysqld_cc,v 1.10 2007/08/08 21:33:51 robert Exp $
+$OpenBSD: patch-sql_mysqld_cc,v 1.11 2008/08/24 08:40:03 brad Exp $
---- sql/mysqld.cc.orig	Wed Jul  4 09:06:03 2007
+--- sql/mysqld.cc.orig	Mon Aug  4 08:20:07 2008
-+++ sql/mysqld.cc	Sat Jul 14 16:19:38 2007
++++ sql/mysqld.cc	Fri Aug  8 17:21:02 2008
-@@ -3543,7 +3543,7 @@ int main(int argc, char **argv)
+@@ -3705,7 +3705,7 @@ int main(int argc, char **argv)
    init_ssl();
  
  #ifdef HAVE_LIBWRAP

databases/mysql/pkg/PLIST-main

@@ -1,19 +1,19 @@
-@comment $OpenBSD: PLIST-main,v 1.5 2007/08/08 21:33:51 robert Exp $
+@comment $OpenBSD: PLIST-main,v 1.6 2008/08/24 08:40:03 brad Exp $
 @pkgpath databases/mysql
-bin/mysql
+@bin bin/mysql
-bin/mysql_client_test
+@bin bin/mysql_client_test
 bin/mysql_config
-bin/mysql_tzinfo_to_sql
+@bin bin/mysql_tzinfo_to_sql
-bin/mysqladmin
+@bin bin/mysqladmin
-bin/mysqlbinlog
+@bin bin/mysqlbinlog
-bin/mysqlcheck
+@bin bin/mysqlcheck
-bin/mysqldump
+@bin bin/mysqldump
 bin/mysqldumpslow
-bin/mysqlimport
+@bin bin/mysqlimport
-bin/mysqlshow
+@bin bin/mysqlshow
-bin/mysqltest
+@bin bin/mysqltest
-bin/mysqltestmanager-pwgen
+@bin bin/mysqltestmanager-pwgen
-bin/mysqltestmanagerc
+@bin bin/mysqltestmanagerc
 include/mysql/
 include/mysql/decimal.h
 include/mysql/errmsg.h

databases/mysql/pkg/PLIST-server

@@ -1,14 +1,14 @@
-@comment $OpenBSD: PLIST-server,v 1.29 2008/01/18 20:31:17 merdely Exp $
+@comment $OpenBSD: PLIST-server,v 1.30 2008/08/24 08:40:03 brad Exp $
 @newgroup _mysql:502
 @newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
-bin/comp_err
+@bin bin/comp_err
-bin/innochecksum
+@bin bin/innochecksum
 bin/msql2mysql
-bin/my_print_defaults
+@bin bin/my_print_defaults
-bin/myisam_ftdump
+@bin bin/myisam_ftdump
-bin/myisamchk
+@bin bin/myisamchk
-bin/myisamlog
+@bin bin/myisamlog
-bin/myisampack
+@bin bin/myisampack
 bin/mysql_convert_table_format
 bin/mysql_explain_log
 bin/mysql_find_rows
@@ -18,19 +18,19 @@ bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
 bin/mysql_tableinfo
-bin/mysql_upgrade
+@bin bin/mysql_upgrade
 bin/mysql_upgrade_shell
-bin/mysql_waitpid
+@bin bin/mysql_waitpid
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqlbug
 bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqlhotcopy
-bin/perror
+@bin bin/perror
-bin/replace
+@bin bin/replace
-bin/resolve_stack_dump
+@bin bin/resolve_stack_dump
-bin/resolveip
+@bin bin/resolveip
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a
@@ -38,8 +38,8 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libvio.a
-libexec/mysqld
+@bin libexec/mysqld
-libexec/mysqlmanager
+@bin libexec/mysqlmanager
 @man man/man1/comp_err.1
 @man man/man1/innochecksum.1
 @man man/man1/make_win_bin_dist.1
@@ -64,6 +64,7 @@ libexec/mysqlmanager
 @man man/man1/mysql_waitpid.1
 @man man/man1/mysql_zap.1
 @man man/man1/mysqlaccess.1
+@man man/man1/mysqlbug.1
 @man man/man1/mysqld_multi.1
 @man man/man1/mysqld_safe.1
 @man man/man1/mysqlhotcopy.1

databases/mysql/pkg/PLIST-tests

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-tests,v 1.26 2008/01/18 20:31:17 merdely Exp $
+@comment $OpenBSD: PLIST-tests,v 1.27 2008/08/24 08:40:03 brad Exp $
 @man man/man1/mysql-stress-test.pl.1
 @man man/man1/mysql-test-run.pl.1
 @man man/man1/mysql_client_test.1
@@ -15,12 +15,15 @@ share/mysql-test/include/ctype_common.inc
 share/mysql-test/include/ctype_filesort.inc
 share/mysql-test/include/ctype_innodb_like.inc
 share/mysql-test/include/ctype_like_escape.inc
+share/mysql-test/include/ctype_like_range_f1f2.inc
+share/mysql-test/include/ctype_regex.inc
 share/mysql-test/include/delete_anonymous_users.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
 share/mysql-test/include/get_binlog_dump_thread_id.inc
 share/mysql-test/include/gis_generic.inc
+share/mysql-test/include/gis_keys.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_big5.inc
@@ -42,6 +45,7 @@ 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_latin2_ch.inc
+share/mysql-test/include/have_local_infile.inc
 share/mysql-test/include/have_log_bin.inc
 share/mysql-test/include/have_lowercase0.inc
 share/mysql-test/include/have_lowercase1.inc
@@ -63,6 +67,7 @@ share/mysql-test/include/mysqltest-x.inc
 share/mysql-test/include/ndb_backup.inc
 share/mysql-test/include/ndb_backup_print.inc
 share/mysql-test/include/ndb_default_cluster.inc
+share/mysql-test/include/ndb_wait_connected.inc
 share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_openssl.inc
@@ -75,7 +80,9 @@ share/mysql-test/include/ps_query.inc
 share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/report-features.test
 share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/show_binary_logs.inc
 share/mysql-test/include/show_binlog_events.inc
+share/mysql-test/include/show_binlog_events2.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
 share/mysql-test/include/sp-vars.inc
@@ -85,6 +92,7 @@ share/mysql-test/include/test_outfile.inc
 share/mysql-test/include/testdb_only.inc
 share/mysql-test/include/uses_vardir.inc
 share/mysql-test/include/varchar.inc
+share/mysql-test/include/wait_condition.inc
 share/mysql-test/include/wait_for_query_to_suceed.inc
 share/mysql-test/include/wait_for_slave_io_to_stop.inc
 share/mysql-test/include/wait_for_slave_param.inc
@@ -116,6 +124,7 @@ share/mysql-test/mysql-test-run-shell
 share/mysql-test/mysql-test-run.pl
 share/mysql-test/r/
 share/mysql-test/r/alias.result
+share/mysql-test/r/almost_full.result
 share/mysql-test/r/alter_table-big.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
@@ -139,8 +148,11 @@ share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
 share/mysql-test/r/binary.result
 share/mysql-test/r/binlog.result
+share/mysql-test/r/binlog_index.result
 share/mysql-test/r/binlog_innodb.result
 share/mysql-test/r/binlog_killed.result
+share/mysql-test/r/binlog_killed_simulate.result
+share/mysql-test/r/binlog_start_comment.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
 share/mysql-test/r/bootstrap.result
@@ -213,6 +225,7 @@ share/mysql-test/r/federated.result
 share/mysql-test/r/federated_archive.result
 share/mysql-test/r/federated_bug_13118.result
 share/mysql-test/r/federated_bug_25714.result
+share/mysql-test/r/federated_disabled.result
 share/mysql-test/r/federated_innodb.result
 share/mysql-test/r/fix_priv_tables.result
 share/mysql-test/r/flush.result
@@ -289,6 +302,7 @@ share/mysql-test/r/have_gbk.require
 share/mysql-test/r/have_geometry.require
 share/mysql-test/r/have_innodb.require
 share/mysql-test/r/have_latin2_ch.require
+share/mysql-test/r/have_local_infile.require
 share/mysql-test/r/have_log_bin.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
@@ -384,10 +398,13 @@ share/mysql-test/r/metadata.result
 share/mysql-test/r/mix_innodb_myisam_binlog.result
 share/mysql-test/r/multi_statement.result
 share/mysql-test/r/multi_update.result
+share/mysql-test/r/multi_update_tiny_hash.result
 share/mysql-test/r/myisam-blob.result
 share/mysql-test/r/myisam.result
+share/mysql-test/r/myisampack.result
 share/mysql-test/r/mysql.result
 share/mysql-test/r/mysql_client_test.result
+share/mysql-test/r/mysql_comments.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysql_upgrade.result
 share/mysql-test/r/mysqladmin.result
@@ -397,11 +414,14 @@ share/mysql-test/r/mysqlbinlog2.result
 share/mysql-test/r/mysqlcheck.result
 share/mysql-test/r/mysqldump-compat.result
 share/mysql-test/r/mysqldump-max.result
+share/mysql-test/r/mysqldump-no-binlog.result
 share/mysql-test/r/mysqldump.result
 share/mysql-test/r/mysqlshow.result
 share/mysql-test/r/mysqltest.result
+share/mysql-test/r/named_pipe.result
 share/mysql-test/r/ndb_alter_table.result
 share/mysql-test/r/ndb_alter_table2.result
+share/mysql-test/r/ndb_auto_increment.result
 share/mysql-test/r/ndb_autodiscover.result
 share/mysql-test/r/ndb_autodiscover2.result
 share/mysql-test/r/ndb_autodiscover3.result
@@ -410,6 +430,7 @@ share/mysql-test/r/ndb_basic.result
 share/mysql-test/r/ndb_bitfield.result
 share/mysql-test/r/ndb_blob.result
 share/mysql-test/r/ndb_bug26793.result
+share/mysql-test/r/ndb_bug31477.result
 share/mysql-test/r/ndb_cache.result
 share/mysql-test/r/ndb_cache2.result
 share/mysql-test/r/ndb_cache_multi.result
@@ -458,8 +479,10 @@ share/mysql-test/r/openssl_2.result
 share/mysql-test/r/order_by.result
 share/mysql-test/r/order_fill_sortbuf.result
 share/mysql-test/r/outfile.result
+share/mysql-test/r/outfile_loaddata.result
 share/mysql-test/r/overflow.result
 share/mysql-test/r/packet.result
+share/mysql-test/r/parser.result
 share/mysql-test/r/parser_precedence.result
 share/mysql-test/r/perror.result
 share/mysql-test/r/preload.result
@@ -490,8 +513,12 @@ share/mysql-test/r/round.result
 share/mysql-test/r/row.result
 share/mysql-test/r/rowid_order_bdb.result
 share/mysql-test/r/rowid_order_innodb.result
+share/mysql-test/r/rpl000001.a.result
+share/mysql-test/r/rpl000001.b.result
 share/mysql-test/r/rpl000001.result
 share/mysql-test/r/rpl000002.result
+share/mysql-test/r/rpl000004.a.result
+share/mysql-test/r/rpl000004.b.result
 share/mysql-test/r/rpl000004.result
 share/mysql-test/r/rpl000005.result
 share/mysql-test/r/rpl000006.result
@@ -507,6 +534,8 @@ share/mysql-test/r/rpl_EE_error.result
 share/mysql-test/r/rpl_alter.result
 share/mysql-test/r/rpl_auto_increment.result
 share/mysql-test/r/rpl_auto_increment_11932.result
+share/mysql-test/r/rpl_auto_increment_bug33029.result
+share/mysql-test/r/rpl_bug33931.result
 share/mysql-test/r/rpl_change_master.result
 share/mysql-test/r/rpl_charset.result
 share/mysql-test/r/rpl_charset_sjis.result
@@ -520,6 +549,7 @@ share/mysql-test/r/rpl_do_grant.result
 share/mysql-test/r/rpl_drop.result
 share/mysql-test/r/rpl_drop_db.result
 share/mysql-test/r/rpl_drop_temp.result
+share/mysql-test/r/rpl_drop_view.result
 share/mysql-test/r/rpl_dual_pos_advance.result
 share/mysql-test/r/rpl_empty_master_crash.result
 share/mysql-test/r/rpl_error_ignored_table.result
@@ -541,6 +571,7 @@ share/mysql-test/r/rpl_insert_select.result
 share/mysql-test/r/rpl_known_bugs_detection.result
 share/mysql-test/r/rpl_loaddata.result
 share/mysql-test/r/rpl_loaddata_charset.result
+share/mysql-test/r/rpl_loaddata_map.result
 share/mysql-test/r/rpl_loaddata_rule_m.result
 share/mysql-test/r/rpl_loaddata_rule_s.result
 share/mysql-test/r/rpl_loaddatalocal.result
@@ -571,11 +602,13 @@ share/mysql-test/r/rpl_replicate_do.result
 share/mysql-test/r/rpl_reset_slave.result
 share/mysql-test/r/rpl_rewrite_db.result
 share/mysql-test/r/rpl_rotate_logs.result
+share/mysql-test/r/rpl_server_id.result
 share/mysql-test/r/rpl_server_id1.result
 share/mysql-test/r/rpl_server_id2.result
 share/mysql-test/r/rpl_session_var.result
 share/mysql-test/r/rpl_set_charset.result
 share/mysql-test/r/rpl_skip_error.result
+share/mysql-test/r/rpl_slave_skip.result
 share/mysql-test/r/rpl_slave_status.result
 share/mysql-test/r/rpl_sp.result
 share/mysql-test/r/rpl_sp_effects.result
@@ -584,9 +617,11 @@ share/mysql-test/r/rpl_ssl.result
 share/mysql-test/r/rpl_start_stop_slave.result
 share/mysql-test/r/rpl_temporary.result
 share/mysql-test/r/rpl_timezone.result
+share/mysql-test/r/rpl_transaction.result
 share/mysql-test/r/rpl_trigger.result
 share/mysql-test/r/rpl_trunc_temp.result
 share/mysql-test/r/rpl_until.result
+share/mysql-test/r/rpl_user.result
 share/mysql-test/r/rpl_user_variables.result
 share/mysql-test/r/rpl_variables.result
 share/mysql-test/r/rpl_view.result
@@ -596,6 +631,7 @@ share/mysql-test/r/select_found.result
 share/mysql-test/r/select_safe.result
 share/mysql-test/r/server_id.require
 share/mysql-test/r/server_id1.require
+share/mysql-test/r/shm.result
 share/mysql-test/r/show_check.result
 share/mysql-test/r/skip_grants.result
 share/mysql-test/r/skip_name_resolve.result
@@ -676,6 +712,7 @@ share/mysql-test/r/type_uint.result
 share/mysql-test/r/type_varchar.result
 share/mysql-test/r/type_year.result
 share/mysql-test/r/udf.result
+share/mysql-test/r/udf_skip_grants.result
 share/mysql-test/r/union.result
 share/mysql-test/r/update.result
 share/mysql-test/r/user_limits.result
@@ -689,7 +726,6 @@ share/mysql-test/r/view_grant.result
 share/mysql-test/r/wait_timeout.result
 share/mysql-test/r/warnings.result
 share/mysql-test/r/windows.result
-share/mysql-test/r/windows_shm.result
 share/mysql-test/r/xa.result
 share/mysql-test/std_data/
 share/mysql-test/std_data/14897.frm
@@ -701,10 +737,32 @@ share/mysql-test/std_data/bug16266.000001
 share/mysql-test/std_data/bug19371.MYD
 share/mysql-test/std_data/bug19371.MYI
 share/mysql-test/std_data/bug19371.frm
+share/mysql-test/std_data/bug35469.dat
+share/mysql-test/std_data/bug36055.MYD
+share/mysql-test/std_data/bug36055.MYI
+share/mysql-test/std_data/bug36055.frm
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/client-cert.pem
 share/mysql-test/std_data/client-key.pem
 share/mysql-test/std_data/des_key_file
+share/mysql-test/std_data/funcs_1/
+share/mysql-test/std_data/funcs_1/innodb_tb1.txt
+share/mysql-test/std_data/funcs_1/innodb_tb2.txt
+share/mysql-test/std_data/funcs_1/innodb_tb3.txt
+share/mysql-test/std_data/funcs_1/innodb_tb4.txt
+share/mysql-test/std_data/funcs_1/load_file.txt
+share/mysql-test/std_data/funcs_1/memory_tb1.txt
+share/mysql-test/std_data/funcs_1/memory_tb2.txt
+share/mysql-test/std_data/funcs_1/memory_tb3.txt
+share/mysql-test/std_data/funcs_1/memory_tb4.txt
+share/mysql-test/std_data/funcs_1/myisam_tb1.txt
+share/mysql-test/std_data/funcs_1/myisam_tb2.txt
+share/mysql-test/std_data/funcs_1/myisam_tb3.txt
+share/mysql-test/std_data/funcs_1/myisam_tb4.txt
+share/mysql-test/std_data/funcs_1/t3.txt
+share/mysql-test/std_data/funcs_1/t4.txt
+share/mysql-test/std_data/funcs_1/t7.txt
+share/mysql-test/std_data/funcs_1/t9.txt
 share/mysql-test/std_data/init_file.dat
 share/mysql-test/std_data/loaddata1.dat
 share/mysql-test/std_data/loaddata2.dat
@@ -752,41 +810,30 @@ share/mysql-test/suite/funcs_1/bitdata/
 share/mysql-test/suite/funcs_1/bitdata/bitdata_master.test
 share/mysql-test/suite/funcs_1/cursors/
 share/mysql-test/suite/funcs_1/cursors/cursors_master.test
-share/mysql-test/suite/funcs_1/data/
-share/mysql-test/suite/funcs_1/data/innodb_tb1.txt
-share/mysql-test/suite/funcs_1/data/innodb_tb2.txt
-share/mysql-test/suite/funcs_1/data/innodb_tb3.txt
-share/mysql-test/suite/funcs_1/data/innodb_tb4.txt
-share/mysql-test/suite/funcs_1/data/memory_tb1.txt
-share/mysql-test/suite/funcs_1/data/memory_tb2.txt
-share/mysql-test/suite/funcs_1/data/memory_tb3.txt
-share/mysql-test/suite/funcs_1/data/memory_tb4.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb1.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb2.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb3.txt
-share/mysql-test/suite/funcs_1/data/myisam_tb4.txt
-share/mysql-test/suite/funcs_1/data/t3.txt
-share/mysql-test/suite/funcs_1/data/t4.txt
-share/mysql-test/suite/funcs_1/data/t7.txt
-share/mysql-test/suite/funcs_1/data/t9.txt
 share/mysql-test/suite/funcs_1/datadict/
+share/mysql-test/suite/funcs_1/datadict/basics_mixed1.inc
+share/mysql-test/suite/funcs_1/datadict/basics_mixed2.inc
+share/mysql-test/suite/funcs_1/datadict/basics_mixed3.inc
+share/mysql-test/suite/funcs_1/datadict/charset_collation.inc
+share/mysql-test/suite/funcs_1/datadict/columns.inc
+share/mysql-test/suite/funcs_1/datadict/datadict.pre
 share/mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
 share/mysql-test/suite/funcs_1/datadict/datadict_load.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+share/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
+share/mysql-test/suite/funcs_1/datadict/is_routines.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
+share/mysql-test/suite/funcs_1/datadict/is_schemata.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
+share/mysql-test/suite/funcs_1/datadict/is_table_query.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
+share/mysql-test/suite/funcs_1/datadict/is_tables.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
+share/mysql-test/suite/funcs_1/datadict/is_triggers.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
+share/mysql-test/suite/funcs_1/datadict/is_views.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
+share/mysql-test/suite/funcs_1/datadict/statistics.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
+share/mysql-test/suite/funcs_1/datadict/table_constraints.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
+share/mysql-test/suite/funcs_1/datadict/tables.inc
-share/mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
+share/mysql-test/suite/funcs_1/datadict/tables1.inc
+share/mysql-test/suite/funcs_1/datadict/tables2.inc
 share/mysql-test/suite/funcs_1/include/
-share/mysql-test/suite/funcs_1/include/create_database.inc
+share/mysql-test/suite/funcs_1/include/bug28309_skip.inc
-share/mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
+share/mysql-test/suite/funcs_1/include/cleanup.inc
-share/mysql-test/suite/funcs_1/include/create_user_no_super.inc
 share/mysql-test/suite/funcs_1/include/innodb_tb1.inc
 share/mysql-test/suite/funcs_1/include/innodb_tb2.inc
 share/mysql-test/suite/funcs_1/include/innodb_tb3.inc
@@ -801,14 +848,14 @@ share/mysql-test/suite/funcs_1/include/myisam_tb3.inc
 share/mysql-test/suite/funcs_1/include/myisam_tb4.inc
 share/mysql-test/suite/funcs_1/include/show_connection.inc
 share/mysql-test/suite/funcs_1/include/sp_tb.inc
+share/mysql-test/suite/funcs_1/include/tb3.inc
 share/mysql-test/suite/funcs_1/lib/
 share/mysql-test/suite/funcs_1/lib/DataGen_local.pl
 share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
 share/mysql-test/suite/funcs_1/r/
-share/mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
+share/mysql-test/suite/funcs_1/r/charset_collation_1.result
-share/mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
+share/mysql-test/suite/funcs_1/r/charset_collation_2.result
-share/mysql-test/suite/funcs_1/r/innodb__datadict.result
+share/mysql-test/suite/funcs_1/r/charset_collation_3.result
-share/mysql-test/suite/funcs_1/r/innodb__load.result
 share/mysql-test/suite/funcs_1/r/innodb_bitdata.result
 share/mysql-test/suite/funcs_1/r/innodb_cursors.result
 share/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -826,10 +873,60 @@ share/mysql-test/suite/funcs_1/r/innodb_trig_08.result
 share/mysql-test/suite/funcs_1/r/innodb_trig_09.result
 share/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
 share/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
-share/mysql-test/suite/funcs_1/r/innodb_triggers.result
 share/mysql-test/suite/funcs_1/r/innodb_views.result
-share/mysql-test/suite/funcs_1/r/memory__datadict.result
+share/mysql-test/suite/funcs_1/r/is_basics_mixed.result
-share/mysql-test/suite/funcs_1/r/memory__load.result
+share/mysql-test/suite/funcs_1/r/is_character_sets.result
+share/mysql-test/suite/funcs_1/r/is_cml_innodb.result
+share/mysql-test/suite/funcs_1/r/is_cml_memory.result
+share/mysql-test/suite/funcs_1/r/is_cml_myisam.result
+share/mysql-test/suite/funcs_1/r/is_cml_ndb.result
+share/mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result
+share/mysql-test/suite/funcs_1/r/is_collations.result
+share/mysql-test/suite/funcs_1/r/is_column_privileges.result
+share/mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result
+share/mysql-test/suite/funcs_1/r/is_columns.result
+share/mysql-test/suite/funcs_1/r/is_columns_innodb.result
+share/mysql-test/suite/funcs_1/r/is_columns_is.result
+share/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
+share/mysql-test/suite/funcs_1/r/is_columns_memory.result
+share/mysql-test/suite/funcs_1/r/is_columns_myisam.result
+share/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
+share/mysql-test/suite/funcs_1/r/is_columns_mysql.result
+share/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_columns_ndb.result
+share/mysql-test/suite/funcs_1/r/is_key_column_usage.result
+share/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
+share/mysql-test/suite/funcs_1/r/is_routines.result
+share/mysql-test/suite/funcs_1/r/is_routines_embedded.result
+share/mysql-test/suite/funcs_1/r/is_schema_privileges.result
+share/mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result
+share/mysql-test/suite/funcs_1/r/is_schemata.result
+share/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
+share/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result
+share/mysql-test/suite/funcs_1/r/is_statistics.result
+share/mysql-test/suite/funcs_1/r/is_statistics_is.result
+share/mysql-test/suite/funcs_1/r/is_statistics_mysql.result
+share/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints_is.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
+share/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_table_privileges.result
+share/mysql-test/suite/funcs_1/r/is_tables.result
+share/mysql-test/suite/funcs_1/r/is_tables_embedded.result
+share/mysql-test/suite/funcs_1/r/is_tables_innodb.result
+share/mysql-test/suite/funcs_1/r/is_tables_is.result
+share/mysql-test/suite/funcs_1/r/is_tables_memory.result
+share/mysql-test/suite/funcs_1/r/is_tables_myisam.result
+share/mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
+share/mysql-test/suite/funcs_1/r/is_tables_mysql.result
+share/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
+share/mysql-test/suite/funcs_1/r/is_tables_ndb.result
+share/mysql-test/suite/funcs_1/r/is_triggers.result
+share/mysql-test/suite/funcs_1/r/is_triggers_embedded.result
+share/mysql-test/suite/funcs_1/r/is_user_privileges.result
+share/mysql-test/suite/funcs_1/r/is_views.result
+share/mysql-test/suite/funcs_1/r/is_views_embedded.result
 share/mysql-test/suite/funcs_1/r/memory_bitdata.result
 share/mysql-test/suite/funcs_1/r/memory_cursors.result
 share/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -846,10 +943,7 @@ share/mysql-test/suite/funcs_1/r/memory_trig_0407.result
 share/mysql-test/suite/funcs_1/r/memory_trig_08.result
 share/mysql-test/suite/funcs_1/r/memory_trig_09.result
 share/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
-share/mysql-test/suite/funcs_1/r/memory_triggers.result
 share/mysql-test/suite/funcs_1/r/memory_views.result
-share/mysql-test/suite/funcs_1/r/myisam__datadict.result
-share/mysql-test/suite/funcs_1/r/myisam__load.result
 share/mysql-test/suite/funcs_1/r/myisam_bitdata.result
 share/mysql-test/suite/funcs_1/r/myisam_cursors.result
 share/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -866,8 +960,13 @@ share/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_08.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_09.result
 share/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
-share/mysql-test/suite/funcs_1/r/myisam_triggers.result
 share/mysql-test/suite/funcs_1/r/myisam_views.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_0102.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_03.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_0407.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_08.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_09.result
+share/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
 share/mysql-test/suite/funcs_1/storedproc/
 share/mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
 share/mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
@@ -880,11 +979,10 @@ share/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
 share/mysql-test/suite/funcs_1/t/
-share/mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
+share/mysql-test/suite/funcs_1/t/charset_collation_1.test
-share/mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
+share/mysql-test/suite/funcs_1/t/charset_collation_2.test
+share/mysql-test/suite/funcs_1/t/charset_collation_3.test
 share/mysql-test/suite/funcs_1/t/disabled.def
-share/mysql-test/suite/funcs_1/t/innodb__datadict.test
-share/mysql-test/suite/funcs_1/t/innodb__load.test
 share/mysql-test/suite/funcs_1/t/innodb_bitdata.test
 share/mysql-test/suite/funcs_1/t/innodb_cursors.test
 share/mysql-test/suite/funcs_1/t/innodb_func_view.test
@@ -903,8 +1001,59 @@ share/mysql-test/suite/funcs_1/t/innodb_trig_09.test
 share/mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
 share/mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
 share/mysql-test/suite/funcs_1/t/innodb_views.test
-share/mysql-test/suite/funcs_1/t/memory__datadict.test
+share/mysql-test/suite/funcs_1/t/is_basics_mixed.test
-share/mysql-test/suite/funcs_1/t/memory__load.test
+share/mysql-test/suite/funcs_1/t/is_character_sets.test
+share/mysql-test/suite/funcs_1/t/is_cml_innodb.test
+share/mysql-test/suite/funcs_1/t/is_cml_memory.test
+share/mysql-test/suite/funcs_1/t/is_cml_myisam.test
+share/mysql-test/suite/funcs_1/t/is_cml_ndb.test
+share/mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
+share/mysql-test/suite/funcs_1/t/is_collations.test
+share/mysql-test/suite/funcs_1/t/is_column_privileges.test
+share/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
+share/mysql-test/suite/funcs_1/t/is_columns.test
+share/mysql-test/suite/funcs_1/t/is_columns_innodb.test
+share/mysql-test/suite/funcs_1/t/is_columns_is.test
+share/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
+share/mysql-test/suite/funcs_1/t/is_columns_memory.test
+share/mysql-test/suite/funcs_1/t/is_columns_myisam.test
+share/mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
+share/mysql-test/suite/funcs_1/t/is_columns_mysql.test
+share/mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_columns_ndb.test
+share/mysql-test/suite/funcs_1/t/is_key_column_usage.test
+share/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
+share/mysql-test/suite/funcs_1/t/is_routines.test
+share/mysql-test/suite/funcs_1/t/is_routines_embedded.test
+share/mysql-test/suite/funcs_1/t/is_schema_privileges.test
+share/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
+share/mysql-test/suite/funcs_1/t/is_schemata.test
+share/mysql-test/suite/funcs_1/t/is_schemata_embedded.test
+share/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
+share/mysql-test/suite/funcs_1/t/is_statistics.test
+share/mysql-test/suite/funcs_1/t/is_statistics_is.test
+share/mysql-test/suite/funcs_1/t/is_statistics_mysql.test
+share/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints_is.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
+share/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_table_privileges.test
+share/mysql-test/suite/funcs_1/t/is_tables.test
+share/mysql-test/suite/funcs_1/t/is_tables_embedded.test
+share/mysql-test/suite/funcs_1/t/is_tables_innodb.test
+share/mysql-test/suite/funcs_1/t/is_tables_is.test
+share/mysql-test/suite/funcs_1/t/is_tables_memory.test
+share/mysql-test/suite/funcs_1/t/is_tables_myisam.test
+share/mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test
+share/mysql-test/suite/funcs_1/t/is_tables_mysql.test
+share/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
+share/mysql-test/suite/funcs_1/t/is_tables_ndb.test
+share/mysql-test/suite/funcs_1/t/is_triggers.test
+share/mysql-test/suite/funcs_1/t/is_triggers_embedded.test
+share/mysql-test/suite/funcs_1/t/is_user_privileges.test
+share/mysql-test/suite/funcs_1/t/is_views.test
+share/mysql-test/suite/funcs_1/t/is_views_embedded.test
 share/mysql-test/suite/funcs_1/t/memory_bitdata.test
 share/mysql-test/suite/funcs_1/t/memory_cursors.test
 share/mysql-test/suite/funcs_1/t/memory_func_view.test
@@ -922,8 +1071,6 @@ share/mysql-test/suite/funcs_1/t/memory_trig_08.test
 share/mysql-test/suite/funcs_1/t/memory_trig_09.test
 share/mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
 share/mysql-test/suite/funcs_1/t/memory_views.test
-share/mysql-test/suite/funcs_1/t/myisam__datadict.test
-share/mysql-test/suite/funcs_1/t/myisam__load.test
 share/mysql-test/suite/funcs_1/t/myisam_bitdata.test
 share/mysql-test/suite/funcs_1/t/myisam_cursors.test
 share/mysql-test/suite/funcs_1/t/myisam_func_view.test
@@ -941,6 +1088,12 @@ share/mysql-test/suite/funcs_1/t/myisam_trig_08.test
 share/mysql-test/suite/funcs_1/t/myisam_trig_09.test
 share/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
 share/mysql-test/suite/funcs_1/t/myisam_views.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_0102.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_03.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_0407.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_08.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_09.test
+share/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
 share/mysql-test/suite/funcs_1/triggers/
 share/mysql-test/suite/funcs_1/triggers/trig_frkey.inc
 share/mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
@@ -950,7 +1103,6 @@ share/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
 share/mysql-test/suite/funcs_1/triggers/triggers_08.inc
 share/mysql-test/suite/funcs_1/triggers/triggers_09.inc
 share/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
-share/mysql-test/suite/funcs_1/triggers/triggers_master.test
 share/mysql-test/suite/funcs_1/views/
 share/mysql-test/suite/funcs_1/views/func_view.inc
 share/mysql-test/suite/funcs_1/views/fv1.inc
@@ -982,14 +1134,260 @@ 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/ndb_charset.test
+share/mysql-test/suite/jp/
+share/mysql-test/suite/jp/r/
+share/mysql-test/suite/jp/r/jp_alter_sjis.result
+share/mysql-test/suite/jp/r/jp_alter_ucs2.result
+share/mysql-test/suite/jp/r/jp_alter_ujis.result
+share/mysql-test/suite/jp/r/jp_alter_utf8.result
+share/mysql-test/suite/jp/r/jp_charlength_sjis.result
+share/mysql-test/suite/jp/r/jp_charlength_ucs2.result
+share/mysql-test/suite/jp/r/jp_charlength_ujis.result
+share/mysql-test/suite/jp/r/jp_charlength_utf8.result
+share/mysql-test/suite/jp/r/jp_charset_sjis.result
+share/mysql-test/suite/jp/r/jp_charset_ucs2.result
+share/mysql-test/suite/jp/r/jp_charset_ujis.result
+share/mysql-test/suite/jp/r/jp_charset_utf8.result
+share/mysql-test/suite/jp/r/jp_convert_sjis.result
+share/mysql-test/suite/jp/r/jp_convert_ucs2.result
+share/mysql-test/suite/jp/r/jp_convert_ujis.result
+share/mysql-test/suite/jp/r/jp_convert_utf8.result
+share/mysql-test/suite/jp/r/jp_create_db_sjis.result
+share/mysql-test/suite/jp/r/jp_create_db_ucs2.result
+share/mysql-test/suite/jp/r/jp_create_db_ujis.result
+share/mysql-test/suite/jp/r/jp_create_db_utf8.result
+share/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
+share/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
+share/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
+share/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
+share/mysql-test/suite/jp/r/jp_enum_sjis.result
+share/mysql-test/suite/jp/r/jp_enum_ucs2.result
+share/mysql-test/suite/jp/r/jp_enum_ujis.result
+share/mysql-test/suite/jp/r/jp_enum_utf8.result
+share/mysql-test/suite/jp/r/jp_insert_sjis.result
+share/mysql-test/suite/jp/r/jp_insert_ucs2.result
+share/mysql-test/suite/jp/r/jp_insert_ujis.result
+share/mysql-test/suite/jp/r/jp_insert_utf8.result
+share/mysql-test/suite/jp/r/jp_instr_sjis.result
+share/mysql-test/suite/jp/r/jp_instr_ucs2.result
+share/mysql-test/suite/jp/r/jp_instr_ujis.result
+share/mysql-test/suite/jp/r/jp_instr_utf8.result
+share/mysql-test/suite/jp/r/jp_join_sjis.result
+share/mysql-test/suite/jp/r/jp_join_ucs2.result
+share/mysql-test/suite/jp/r/jp_join_ujis.result
+share/mysql-test/suite/jp/r/jp_join_utf8.result
+share/mysql-test/suite/jp/r/jp_left_sjis.result
+share/mysql-test/suite/jp/r/jp_left_ucs2.result
+share/mysql-test/suite/jp/r/jp_left_ujis.result
+share/mysql-test/suite/jp/r/jp_left_utf8.result
+share/mysql-test/suite/jp/r/jp_length_sjis.result
+share/mysql-test/suite/jp/r/jp_length_ucs2.result
+share/mysql-test/suite/jp/r/jp_length_ujis.result
+share/mysql-test/suite/jp/r/jp_length_utf8.result
+share/mysql-test/suite/jp/r/jp_like_sjis.result
+share/mysql-test/suite/jp/r/jp_like_ucs2.result
+share/mysql-test/suite/jp/r/jp_like_ujis.result
+share/mysql-test/suite/jp/r/jp_like_utf8.result
+share/mysql-test/suite/jp/r/jp_locate_sjis.result
+share/mysql-test/suite/jp/r/jp_locate_ucs2.result
+share/mysql-test/suite/jp/r/jp_locate_ujis.result
+share/mysql-test/suite/jp/r/jp_locate_utf8.result
+share/mysql-test/suite/jp/r/jp_lpad_sjis.result
+share/mysql-test/suite/jp/r/jp_lpad_ucs2.result
+share/mysql-test/suite/jp/r/jp_lpad_ujis.result
+share/mysql-test/suite/jp/r/jp_lpad_utf8.result
+share/mysql-test/suite/jp/r/jp_ltrim_sjis.result
+share/mysql-test/suite/jp/r/jp_ltrim_ucs2.result
+share/mysql-test/suite/jp/r/jp_ltrim_ujis.result
+share/mysql-test/suite/jp/r/jp_ltrim_utf8.result
+share/mysql-test/suite/jp/r/jp_ps_sjis.result
+share/mysql-test/suite/jp/r/jp_ps_ujis.result
+share/mysql-test/suite/jp/r/jp_replace_sjis.result
+share/mysql-test/suite/jp/r/jp_replace_ucs2.result
+share/mysql-test/suite/jp/r/jp_replace_ujis.result
+share/mysql-test/suite/jp/r/jp_replace_utf8.result
+share/mysql-test/suite/jp/r/jp_reverse_sjis.result
+share/mysql-test/suite/jp/r/jp_reverse_ucs2.result
+share/mysql-test/suite/jp/r/jp_reverse_ujis.result
+share/mysql-test/suite/jp/r/jp_reverse_utf8.result
+share/mysql-test/suite/jp/r/jp_right_sjis.result
+share/mysql-test/suite/jp/r/jp_right_ucs2.result
+share/mysql-test/suite/jp/r/jp_right_ujis.result
+share/mysql-test/suite/jp/r/jp_right_utf8.result
+share/mysql-test/suite/jp/r/jp_rpad_sjis.result
+share/mysql-test/suite/jp/r/jp_rpad_ucs2.result
+share/mysql-test/suite/jp/r/jp_rpad_ujis.result
+share/mysql-test/suite/jp/r/jp_rpad_utf8.result
+share/mysql-test/suite/jp/r/jp_rtrim_sjis.result
+share/mysql-test/suite/jp/r/jp_rtrim_ucs2.result
+share/mysql-test/suite/jp/r/jp_rtrim_ujis.result
+share/mysql-test/suite/jp/r/jp_rtrim_utf8.result
+share/mysql-test/suite/jp/r/jp_select_sjis.result
+share/mysql-test/suite/jp/r/jp_select_ucs2.result
+share/mysql-test/suite/jp/r/jp_select_ujis.result
+share/mysql-test/suite/jp/r/jp_select_utf8.result
+share/mysql-test/suite/jp/r/jp_subquery_sjis.result
+share/mysql-test/suite/jp/r/jp_subquery_ucs2.result
+share/mysql-test/suite/jp/r/jp_subquery_ujis.result
+share/mysql-test/suite/jp/r/jp_subquery_utf8.result
+share/mysql-test/suite/jp/r/jp_substring_sjis.result
+share/mysql-test/suite/jp/r/jp_substring_ucs2.result
+share/mysql-test/suite/jp/r/jp_substring_ujis.result
+share/mysql-test/suite/jp/r/jp_substring_utf8.result
+share/mysql-test/suite/jp/r/jp_trim_sjis.result
+share/mysql-test/suite/jp/r/jp_trim_ucs2.result
+share/mysql-test/suite/jp/r/jp_trim_ujis.result
+share/mysql-test/suite/jp/r/jp_trim_utf8.result
+share/mysql-test/suite/jp/r/jp_union_ujis.result
+share/mysql-test/suite/jp/r/jp_update_sjis.result
+share/mysql-test/suite/jp/r/jp_update_ucs2.result
+share/mysql-test/suite/jp/r/jp_update_ujis.result
+share/mysql-test/suite/jp/r/jp_update_utf8.result
+share/mysql-test/suite/jp/r/jp_where_sjis.result
+share/mysql-test/suite/jp/r/jp_where_ucs2.result
+share/mysql-test/suite/jp/r/jp_where_ujis.result
+share/mysql-test/suite/jp/r/jp_where_utf8.result
+share/mysql-test/suite/jp/std_data/
+share/mysql-test/suite/jp/std_data/jisx0201_sjis.dat
+share/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat
+share/mysql-test/suite/jp/std_data/jisx0201_ujis.dat
+share/mysql-test/suite/jp/std_data/jisx0201_utf8.dat
+share/mysql-test/suite/jp/std_data/jisx0208_sjis.dat
+share/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
+share/mysql-test/suite/jp/std_data/jisx0208_sjis3.dat
+share/mysql-test/suite/jp/std_data/jisx0208_ucs2.dat
+share/mysql-test/suite/jp/std_data/jisx0208_ujis.dat
+share/mysql-test/suite/jp/std_data/jisx0208_utf8.dat
+share/mysql-test/suite/jp/std_data/jisx0212_ucs2.dat
+share/mysql-test/suite/jp/std_data/jisx0212_ujis.dat
+share/mysql-test/suite/jp/std_data/jisx0212_utf8.dat
+share/mysql-test/suite/jp/t/
+share/mysql-test/suite/jp/t/jp_alter_sjis.test
+share/mysql-test/suite/jp/t/jp_alter_ucs2.test
+share/mysql-test/suite/jp/t/jp_alter_ujis.test
+share/mysql-test/suite/jp/t/jp_alter_utf8.test
+share/mysql-test/suite/jp/t/jp_charlength_sjis.test
+share/mysql-test/suite/jp/t/jp_charlength_ucs2.test
+share/mysql-test/suite/jp/t/jp_charlength_ujis.test
+share/mysql-test/suite/jp/t/jp_charlength_utf8.test
+share/mysql-test/suite/jp/t/jp_charset_sjis.test
+share/mysql-test/suite/jp/t/jp_charset_ucs2.test
+share/mysql-test/suite/jp/t/jp_charset_ujis.test
+share/mysql-test/suite/jp/t/jp_charset_utf8.test
+share/mysql-test/suite/jp/t/jp_convert_sjis.test
+share/mysql-test/suite/jp/t/jp_convert_ucs2.test
+share/mysql-test/suite/jp/t/jp_convert_ujis.test
+share/mysql-test/suite/jp/t/jp_convert_utf8.test
+share/mysql-test/suite/jp/t/jp_create_db_sjis.test
+share/mysql-test/suite/jp/t/jp_create_db_ucs2.test
+share/mysql-test/suite/jp/t/jp_create_db_ujis.test
+share/mysql-test/suite/jp/t/jp_create_db_utf8.test
+share/mysql-test/suite/jp/t/jp_create_tbl_sjis.test
+share/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
+share/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
+share/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
+share/mysql-test/suite/jp/t/jp_enum_sjis.test
+share/mysql-test/suite/jp/t/jp_enum_ucs2.test
+share/mysql-test/suite/jp/t/jp_enum_ujis.test
+share/mysql-test/suite/jp/t/jp_enum_utf8.test
+share/mysql-test/suite/jp/t/jp_insert_sjis.test
+share/mysql-test/suite/jp/t/jp_insert_ucs2.test
+share/mysql-test/suite/jp/t/jp_insert_ujis.test
+share/mysql-test/suite/jp/t/jp_insert_utf8.test
+share/mysql-test/suite/jp/t/jp_instr_sjis.test
+share/mysql-test/suite/jp/t/jp_instr_ucs2.test
+share/mysql-test/suite/jp/t/jp_instr_ujis.test
+share/mysql-test/suite/jp/t/jp_instr_utf8.test
+share/mysql-test/suite/jp/t/jp_join_sjis.test
+share/mysql-test/suite/jp/t/jp_join_ucs2.test
+share/mysql-test/suite/jp/t/jp_join_ujis.test
+share/mysql-test/suite/jp/t/jp_join_utf8.test
+share/mysql-test/suite/jp/t/jp_left_sjis.test
+share/mysql-test/suite/jp/t/jp_left_ucs2.test
+share/mysql-test/suite/jp/t/jp_left_ujis.test
+share/mysql-test/suite/jp/t/jp_left_utf8.test
+share/mysql-test/suite/jp/t/jp_length_sjis.test
+share/mysql-test/suite/jp/t/jp_length_ucs2.test
+share/mysql-test/suite/jp/t/jp_length_ujis.test
+share/mysql-test/suite/jp/t/jp_length_utf8.test
+share/mysql-test/suite/jp/t/jp_like_sjis.test
+share/mysql-test/suite/jp/t/jp_like_ucs2.test
+share/mysql-test/suite/jp/t/jp_like_ujis.test
+share/mysql-test/suite/jp/t/jp_like_utf8.test
+share/mysql-test/suite/jp/t/jp_locate_sjis.test
+share/mysql-test/suite/jp/t/jp_locate_ucs2.test
+share/mysql-test/suite/jp/t/jp_locate_ujis.test
+share/mysql-test/suite/jp/t/jp_locate_utf8.test
+share/mysql-test/suite/jp/t/jp_lpad_sjis.test
+share/mysql-test/suite/jp/t/jp_lpad_ucs2.test
+share/mysql-test/suite/jp/t/jp_lpad_ujis.test
+share/mysql-test/suite/jp/t/jp_lpad_utf8.test
+share/mysql-test/suite/jp/t/jp_ltrim_sjis.test
+share/mysql-test/suite/jp/t/jp_ltrim_ucs2.test
+share/mysql-test/suite/jp/t/jp_ltrim_ujis.test
+share/mysql-test/suite/jp/t/jp_ltrim_utf8.test
+share/mysql-test/suite/jp/t/jp_ps_sjis.test
+share/mysql-test/suite/jp/t/jp_ps_ujis.test
+share/mysql-test/suite/jp/t/jp_replace_sjis.test
+share/mysql-test/suite/jp/t/jp_replace_ucs2.test
+share/mysql-test/suite/jp/t/jp_replace_ujis.test
+share/mysql-test/suite/jp/t/jp_replace_utf8.test
+share/mysql-test/suite/jp/t/jp_reverse_sjis.test
+share/mysql-test/suite/jp/t/jp_reverse_ucs2.test
+share/mysql-test/suite/jp/t/jp_reverse_ujis.test
+share/mysql-test/suite/jp/t/jp_reverse_utf8.test
+share/mysql-test/suite/jp/t/jp_right_sjis.test
+share/mysql-test/suite/jp/t/jp_right_ucs2.test
+share/mysql-test/suite/jp/t/jp_right_ujis.test
+share/mysql-test/suite/jp/t/jp_right_utf8.test
+share/mysql-test/suite/jp/t/jp_rpad_sjis.test
+share/mysql-test/suite/jp/t/jp_rpad_ucs2.test
+share/mysql-test/suite/jp/t/jp_rpad_ujis.test
+share/mysql-test/suite/jp/t/jp_rpad_utf8.test
+share/mysql-test/suite/jp/t/jp_rtrim_sjis.test
+share/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
+share/mysql-test/suite/jp/t/jp_rtrim_ujis.test
+share/mysql-test/suite/jp/t/jp_rtrim_utf8.test
+share/mysql-test/suite/jp/t/jp_select_sjis.test
+share/mysql-test/suite/jp/t/jp_select_ucs2.test
+share/mysql-test/suite/jp/t/jp_select_ujis.test
+share/mysql-test/suite/jp/t/jp_select_utf8.test
+share/mysql-test/suite/jp/t/jp_subquery_sjis.test
+share/mysql-test/suite/jp/t/jp_subquery_ucs2.test
+share/mysql-test/suite/jp/t/jp_subquery_ujis.test
+share/mysql-test/suite/jp/t/jp_subquery_utf8.test
+share/mysql-test/suite/jp/t/jp_substring_sjis.test
+share/mysql-test/suite/jp/t/jp_substring_ucs2.test
+share/mysql-test/suite/jp/t/jp_substring_ujis.test
+share/mysql-test/suite/jp/t/jp_substring_utf8.test
+share/mysql-test/suite/jp/t/jp_trim_sjis.test
+share/mysql-test/suite/jp/t/jp_trim_ucs2.test
+share/mysql-test/suite/jp/t/jp_trim_ujis.test
+share/mysql-test/suite/jp/t/jp_trim_utf8.test
+share/mysql-test/suite/jp/t/jp_union_ujis.test
+share/mysql-test/suite/jp/t/jp_update_sjis.test
+share/mysql-test/suite/jp/t/jp_update_ucs2.test
+share/mysql-test/suite/jp/t/jp_update_ujis.test
+share/mysql-test/suite/jp/t/jp_update_utf8.test
+share/mysql-test/suite/jp/t/jp_where_sjis.test
+share/mysql-test/suite/jp/t/jp_where_ucs2.test
+share/mysql-test/suite/jp/t/jp_where_ujis.test
+share/mysql-test/suite/jp/t/jp_where_utf8.test
 share/mysql-test/suite/large_tests/
 share/mysql-test/suite/large_tests/README.TXT
 share/mysql-test/suite/large_tests/r/
 share/mysql-test/suite/large_tests/r/alter_table.result
 share/mysql-test/suite/large_tests/t/
 share/mysql-test/suite/large_tests/t/alter_table.test
+share/mysql-test/suite/manual/
+share/mysql-test/suite/manual/r/
+share/mysql-test/suite/manual/r/rpl_replication_delay.result
+share/mysql-test/suite/manual/t/
+share/mysql-test/suite/manual/t/rpl_replication_delay-slave.opt
+share/mysql-test/suite/manual/t/rpl_replication_delay.test
 share/mysql-test/t/
 share/mysql-test/t/alias.test
+share/mysql-test/t/almost_full.test
 share/mysql-test/t/alter_table-big.test
 share/mysql-test/t/alter_table.test
 share/mysql-test/t/analyse.test
@@ -1016,8 +1414,12 @@ share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
 share/mysql-test/t/binlog-master.opt
 share/mysql-test/t/binlog.test
+share/mysql-test/t/binlog_index.test
 share/mysql-test/t/binlog_innodb.test
 share/mysql-test/t/binlog_killed.test
+share/mysql-test/t/binlog_killed_simulate-master.opt
+share/mysql-test/t/binlog_killed_simulate.test
+share/mysql-test/t/binlog_start_comment.test
 share/mysql-test/t/blackhole.test
 share/mysql-test/t/bool.test
 share/mysql-test/t/bootstrap.test
@@ -1095,6 +1497,8 @@ share/mysql-test/t/federated.test
 share/mysql-test/t/federated_archive.test
 share/mysql-test/t/federated_bug_13118.test
 share/mysql-test/t/federated_bug_25714.test
+share/mysql-test/t/federated_disabled-master.opt
+share/mysql-test/t/federated_disabled.test
 share/mysql-test/t/federated_innodb-slave.opt
 share/mysql-test/t/federated_innodb.test
 share/mysql-test/t/fix_priv_tables.test
@@ -1254,12 +1658,17 @@ share/mysql-test/t/multi_statement-master.opt
 share/mysql-test/t/multi_statement.test
 share/mysql-test/t/multi_update-master.opt
 share/mysql-test/t/multi_update.test
+share/mysql-test/t/multi_update_tiny_hash-master.opt
+share/mysql-test/t/multi_update_tiny_hash.test
 share/mysql-test/t/myisam-blob-master.opt
 share/mysql-test/t/myisam-blob.test
 share/mysql-test/t/myisam.test
+share/mysql-test/t/myisampack.test
 share/mysql-test/t/mysql.test
 share/mysql-test/t/mysql_client_test.opt
 share/mysql-test/t/mysql_client_test.test
+share/mysql-test/t/mysql_comments.sql
+share/mysql-test/t/mysql_comments.test
 share/mysql-test/t/mysql_delimiter.sql
 share/mysql-test/t/mysql_delimiter_19799.sql
 share/mysql-test/t/mysql_delimiter_source.sql
@@ -1275,11 +1684,16 @@ share/mysql-test/t/mysqlcheck.test
 share/mysql-test/t/mysqldump-compat.opt
 share/mysql-test/t/mysqldump-compat.test
 share/mysql-test/t/mysqldump-max.test
+share/mysql-test/t/mysqldump-no-binlog-master.opt
+share/mysql-test/t/mysqldump-no-binlog.test
 share/mysql-test/t/mysqldump.test
 share/mysql-test/t/mysqlshow.test
 share/mysql-test/t/mysqltest.test
+share/mysql-test/t/named_pipe-master.opt
+share/mysql-test/t/named_pipe.test
 share/mysql-test/t/ndb_alter_table.test
 share/mysql-test/t/ndb_alter_table2.test
+share/mysql-test/t/ndb_auto_increment.test
 share/mysql-test/t/ndb_autodiscover.test
 share/mysql-test/t/ndb_autodiscover2-master.opt
 share/mysql-test/t/ndb_autodiscover2.test
@@ -1289,6 +1703,7 @@ share/mysql-test/t/ndb_basic.test
 share/mysql-test/t/ndb_bitfield.test
 share/mysql-test/t/ndb_blob.test
 share/mysql-test/t/ndb_bug26793.test
+share/mysql-test/t/ndb_bug31477.test
 share/mysql-test/t/ndb_cache.test
 share/mysql-test/t/ndb_cache2.test
 share/mysql-test/t/ndb_cache_multi.test
@@ -1333,8 +1748,10 @@ share/mysql-test/t/order_by.test
 share/mysql-test/t/order_fill_sortbuf-master.opt
 share/mysql-test/t/order_fill_sortbuf.test
 share/mysql-test/t/outfile.test
+share/mysql-test/t/outfile_loaddata.test
 share/mysql-test/t/overflow.test
 share/mysql-test/t/packet.test
+share/mysql-test/t/parser.test
 share/mysql-test/t/parser_precedence.test
 share/mysql-test/t/perror.test
 share/mysql-test/t/preload.test
@@ -1395,6 +1812,9 @@ share/mysql-test/t/rpl_alter.test
 share/mysql-test/t/rpl_auto_increment-master.opt
 share/mysql-test/t/rpl_auto_increment.test
 share/mysql-test/t/rpl_auto_increment_11932.test
+share/mysql-test/t/rpl_auto_increment_bug33029.test
+share/mysql-test/t/rpl_bug33931-slave.opt
+share/mysql-test/t/rpl_bug33931.test
 share/mysql-test/t/rpl_change_master.test
 share/mysql-test/t/rpl_charset.test
 share/mysql-test/t/rpl_charset_sjis.test
@@ -1412,7 +1832,9 @@ share/mysql-test/t/rpl_drop.test
 share/mysql-test/t/rpl_drop_db.test
 share/mysql-test/t/rpl_drop_temp-slave.opt
 share/mysql-test/t/rpl_drop_temp.test
+share/mysql-test/t/rpl_drop_view.test
 share/mysql-test/t/rpl_dual_pos_advance-master.opt
+share/mysql-test/t/rpl_dual_pos_advance-slave.opt
 share/mysql-test/t/rpl_dual_pos_advance.test
 share/mysql-test/t/rpl_empty_master_crash-master.opt
 share/mysql-test/t/rpl_empty_master_crash.test
@@ -1449,6 +1871,9 @@ share/mysql-test/t/rpl_known_bugs_detection-master.opt
 share/mysql-test/t/rpl_known_bugs_detection.test
 share/mysql-test/t/rpl_loaddata.test
 share/mysql-test/t/rpl_loaddata_charset.test
+share/mysql-test/t/rpl_loaddata_map-master.opt
+share/mysql-test/t/rpl_loaddata_map-slave.opt
+share/mysql-test/t/rpl_loaddata_map.test
 share/mysql-test/t/rpl_loaddata_rule_m-master.opt
 share/mysql-test/t/rpl_loaddata_rule_m.test
 share/mysql-test/t/rpl_loaddata_rule_s-slave.opt
@@ -1498,6 +1923,7 @@ share/mysql-test/t/rpl_rotate_logs-master.opt
 share/mysql-test/t/rpl_rotate_logs-slave.sh
 share/mysql-test/t/rpl_rotate_logs.slave-mi
 share/mysql-test/t/rpl_rotate_logs.test
+share/mysql-test/t/rpl_server_id.test
 share/mysql-test/t/rpl_server_id1.test
 share/mysql-test/t/rpl_server_id2-slave.opt
 share/mysql-test/t/rpl_server_id2.test
@@ -1505,6 +1931,8 @@ share/mysql-test/t/rpl_session_var.test
 share/mysql-test/t/rpl_set_charset.test
 share/mysql-test/t/rpl_skip_error-slave.opt
 share/mysql-test/t/rpl_skip_error.test
+share/mysql-test/t/rpl_slave_skip-slave.opt
+share/mysql-test/t/rpl_slave_skip.test
 share/mysql-test/t/rpl_slave_status.test
 share/mysql-test/t/rpl_sp-master.opt
 share/mysql-test/t/rpl_sp-slave.opt
@@ -1520,9 +1948,13 @@ share/mysql-test/t/rpl_temporary.test
 share/mysql-test/t/rpl_timezone-master.opt
 share/mysql-test/t/rpl_timezone-slave.opt
 share/mysql-test/t/rpl_timezone.test
+share/mysql-test/t/rpl_transaction-master.opt
+share/mysql-test/t/rpl_transaction-slave.opt
+share/mysql-test/t/rpl_transaction.test
 share/mysql-test/t/rpl_trigger.test
 share/mysql-test/t/rpl_trunc_temp.test
 share/mysql-test/t/rpl_until.test
+share/mysql-test/t/rpl_user.test
 share/mysql-test/t/rpl_user_variables.test
 share/mysql-test/t/rpl_variables-master.opt
 share/mysql-test/t/rpl_variables.test
@@ -1532,6 +1964,8 @@ share/mysql-test/t/schema.test
 share/mysql-test/t/select.test
 share/mysql-test/t/select_found.test
 share/mysql-test/t/select_safe.test
+share/mysql-test/t/shm-master.opt
+share/mysql-test/t/shm.test
 share/mysql-test/t/show_check-master.opt
 share/mysql-test/t/show_check.test
 share/mysql-test/t/skip_grants-master.opt
@@ -1620,6 +2054,8 @@ share/mysql-test/t/type_uint.test
 share/mysql-test/t/type_varchar.test
 share/mysql-test/t/type_year.test
 share/mysql-test/t/udf.test
+share/mysql-test/t/udf_skip_grants-master.opt
+share/mysql-test/t/udf_skip_grants.test
 share/mysql-test/t/union-master.opt
 share/mysql-test/t/union.test
 share/mysql-test/t/update.test
@@ -1639,6 +2075,4 @@ share/mysql-test/t/wait_timeout.test
 share/mysql-test/t/warnings-master.opt
 share/mysql-test/t/warnings.test
 share/mysql-test/t/windows.test
-share/mysql-test/t/windows_shm-master.opt
-share/mysql-test/t/windows_shm.test
 share/mysql-test/t/xa.test