People running with 4.2-stable may want to test / modify /run with the
following upgrade to MySQL from 5.0.45 to 5.0.51
Fixes security issues
http://www.auscert.org.au/render.html?it=8584
CVE Id(s) : CVE-2007-3781 CVE-2007-5969 CVE-2007-6304
Several local/remote vulnerabilities have been discovered in the MySQL
database server. The Common Vulnerabilities and Exposures project
identifies the following problems:
CVE-2007-3781
It was discovered that privilege validation for the source table
of CREATE TABLE LIKE statements was insufficiently enforced, which
might lead to information disclosure. This is only exploitable by
authenticated users.
CVE-2007-5969
It was discovered that symbolic links were handled insecurely during
the creation of tables with DATA DIRECTORY or INDEX DIRECTORY
statements, which might lead to denial of service by overwriting
data. This is only exploitable by authenticated users.
CVE-2007-6304
It was discovered that queries to data in a FEDERATED table can
lead to a crash of the local database server, if the remote server
returns information with less columns than expected, resulting in
denial of service.
Ian McWilliam
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.132
diff -u -r1.132 Makefile
--- Makefile 8 Aug 2007 21:33:51 -0000 1.132
+++ Makefile 9 Jan 2008 08:46:39 -0000
@@ -9,7 +9,7 @@
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite)
-VERSION= 5.0.45
+VERSION= 5.0.51
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server= mysql-server-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.31
diff -u -r1.31 distinfo
--- distinfo 8 Aug 2007 21:33:51 -0000 1.31
+++ distinfo 9 Jan 2008 08:46:39 -0000
@@ -1,5 +1,5 @@
-MD5 (mysql-5.0.45.tar.gz) = oqHFqCuyK0Wrdqjsq5ThDQ==
-RMD160 (mysql-5.0.45.tar.gz) = 7mcXxl3Hu2tbWWuQ72xHx/3r9fs=
-SHA1 (mysql-5.0.45.tar.gz) = pfuo4ASsxDrBpXbXKPECFfVOviA=
-SHA256 (mysql-5.0.45.tar.gz) = 5EQ9jchZ7VO9nzvvFDzjDH9d7magJ0jpoAMTa+JeAGA=
-SIZE (mysql-5.0.45.tar.gz) = 24433261
+MD5 (mysql-5.0.51.tar.gz) = iMOcjLd4EP67g7fuYlNk1w==
+RMD160 (mysql-5.0.51.tar.gz) = 4UuqHEDLOF+mT8cjVducpYpr4vk=
+SHA1 (mysql-5.0.51.tar.gz) = qaJT6oQulz329HXATax3Ui3g3qc=
+SHA256 (mysql-5.0.51.tar.gz) = tYQHToAyii5lUV7z35R6gSmeMUCnuop+n43PTpLVc2s=
+SIZE (mysql-5.0.51.tar.gz) = 27045586
Index: patches/patch-mysql-test_Makefile_in
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-mysql-test_Makefile_in,v
retrieving revision 1.15
diff -u -r1.15 patch-mysql-test_Makefile_in
--- patches/patch-mysql-test_Makefile_in 8 Aug 2007 21:33:51 -0000
1.15
+++ patches/patch-mysql-test_Makefile_in 9 Jan 2008 08:46:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.15 2007/08/08 21:33:51 robert Exp $
---- mysql-test/Makefile.in.orig Wed Jul 4 09:09:38 2007
-+++ mysql-test/Makefile.in Sat Jul 14 16:19:38 2007
-@@ -375,7 +375,7 @@ zlib_dir = @zlib_dir@
+--- mysql-test/Makefile.in.orig Fri Nov 16 01:08:22 2007
++++ mysql-test/Makefile.in Wed Jan 9 08:09:57 2008
+@@ -366,7 +366,7 @@ zlib_dir = @zlib_dir@
@[EMAIL PROTECTED] = ndb
@[EMAIL PROTECTED] = \"\"
@[EMAIL PROTECTED] = \"--ndbcluster\"
Index: patches/patch-scripts_mysql_install_db_sh
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-scripts_mysql_install_db_sh,v
retrieving revision 1.8
diff -u -r1.8 patch-scripts_mysql_install_db_sh
--- patches/patch-scripts_mysql_install_db_sh 8 Aug 2007 21:33:51 -0000
1.8
+++ patches/patch-scripts_mysql_install_db_sh 9 Jan 2008 08:46:39 -0000
@@ -1,54 +1,41 @@
$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.8 2007/08/08 21:33:51 robert
Exp $
---- scripts/mysql_install_db.sh.orig Wed Jul 4 09:06:09 2007
-+++ scripts/mysql_install_db.sh Sat Jul 14 16:19:38 2007
-@@ -21,7 +21,8 @@
- in_rpm=0
- windows=0
+--- scripts/mysql_install_db.sh.orig Fri Nov 16 01:06:33 2007
++++ scripts/mysql_install_db.sh Wed Jan 9 08:25:13 2008
+@@ -25,7 +25,8 @@ srcdir=""
+ args=""
defaults=""
+ mysqld_opt=""
-user=""
+user=_mysql
+group=_mysql
- case "$1" in
- --no-defaults|--defaults-file=*|--defaults-extra-file=*)
-@@ -59,6 +60,7 @@ parse_arguments() {
+ force=0
+ in_rpm=0
+@@ -102,6 +103,7 @@ parse_arguments()
# as 'user' (crucial e.g. if log-bin=/some_other_path/
# where a chown of datadir won't help)
- user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+ user=`parse_arg "$arg"` ;;
+ --group=*) group=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ;; # Obsolete
--rpm) in_rpm=1 ;;
-@@ -252,20 +254,18 @@ fi
-
- # Create database directories mysql & test
- if test ! -d $ldata; then
-- mkdir $ldata;
-+ mkdir -p $ldata;
- chmod 700 $ldata ;
- fi
- if test ! -d $ldata/mysql; then
-- mkdir $ldata/mysql;
-+ mkdir -p $ldata/mysql;
- chmod 700 $ldata/mysql ;
- fi
- if test ! -d $ldata/test; then
-- mkdir $ldata/test;
-+ mkdir -p $ldata/test;
- chmod 700 $ldata/test ;
- fi
--if test -w / -a ! -z "$user"; then
-- chown $user $ldata $ldata/mysql $ldata/test;
--fi
-+chown -f $user:$group $ldata $ldata/mysql $ldata/test
+@@ -318,10 +320,7 @@ do
+ mkdir -p $dir
+ chmod 700 $dir
+ fi
+- if test -w / -a ! -z "$user"
+- then
+- chown $user $dir
+- fi
++ chown $user:$group $dir
+ done
- if test -n "$user"; then
- args="$args --user=$user"
-@@ -300,11 +300,6 @@ then
- fi
+ if test -n "$user"
+@@ -354,11 +353,6 @@ then
+ echo
fi
-- s_echo ""
+- s_echo
- s_echo "To start mysqld at boot time you have to copy"
- s_echo "support-files/mysql.server to the right place for your system"
- s_echo
@@ -56,11 +43,11 @@
if test "$windows" -eq 0
then
# A root password should of course also be set on Windows!
-@@ -319,15 +314,6 @@ then
- echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
+@@ -382,15 +376,6 @@ then
echo "See the manual for more instructions."
+ echo
-- if test "$in_rpm" = "0"
+- if test "$in_rpm" -eq 0
- then
- echo "You can start the MySQL daemon with:"
- echo "cd @prefix@ ; $bindir/mysqld_safe &"
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -r1.5 PLIST-main
--- pkg/PLIST-main 8 Aug 2007 21:33:51 -0000 1.5
+++ pkg/PLIST-main 9 Jan 2008 08:46:39 -0000
@@ -1,4 +1,19 @@
+%%SHARED%%
@comment $OpenBSD: PLIST-main,v 1.5 2007/08/08 21:33:51 robert Exp $
[EMAIL PROTECTED] info/mysql.info
[EMAIL PROTECTED] man/man1/mysql.1
[EMAIL PROTECTED] man/man1/mysql_config.1
[EMAIL PROTECTED] man/man1/mysql_tzinfo_to_sql.1
[EMAIL PROTECTED] man/man1/mysqladmin.1
[EMAIL PROTECTED] man/man1/mysqlbinlog.1
[EMAIL PROTECTED] man/man1/mysqlcheck.1
[EMAIL PROTECTED] man/man1/mysqldump.1
[EMAIL PROTECTED] man/man1/mysqlimport.1
[EMAIL PROTECTED] man/man1/mysqlman.1
[EMAIL PROTECTED] man/man1/mysqlmanager-pwgen.1
[EMAIL PROTECTED] man/man1/mysqlmanagerc.1
[EMAIL PROTECTED] man/man1/mysqlshow.1
[EMAIL PROTECTED] man/man1/mysqltest.1
@pkgpath databases/mysql
bin/mysql
bin/mysql_client_test
@@ -47,23 +62,9 @@
include/mysql/sslopt-longopts.h
include/mysql/sslopt-vars.h
include/mysql/typelib.h
[EMAIL PROTECTED] info/mysql.info
lib/mysql/
lib/mysql/libmysqlclient.a
lib/mysql/libmysqlclient.la
lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.la
-%%SHARED%%
[EMAIL PROTECTED] man/man1/mysql.1
[EMAIL PROTECTED] man/man1/mysql_config.1
[EMAIL PROTECTED] man/man1/mysql_tzinfo_to_sql.1
[EMAIL PROTECTED] man/man1/mysqladmin.1
[EMAIL PROTECTED] man/man1/mysqlbinlog.1
[EMAIL PROTECTED] man/man1/mysqlcheck.1
[EMAIL PROTECTED] man/man1/mysqldump.1
[EMAIL PROTECTED] man/man1/mysqlimport.1
[EMAIL PROTECTED] man/man1/mysqlman.1
[EMAIL PROTECTED] man/man1/mysqlmanager-pwgen.1
[EMAIL PROTECTED] man/man1/mysqlmanagerc.1
[EMAIL PROTECTED] man/man1/mysqlshow.1
[EMAIL PROTECTED] man/man1/mysqltest.1
+share/mysql/mysqld_multi.server
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-tests,v
retrieving revision 1.25
diff -u -r1.25 PLIST-tests
--- pkg/PLIST-tests 8 Aug 2007 21:33:51 -0000 1.25
+++ pkg/PLIST-tests 9 Jan 2008 08:46:41 -0000
@@ -4,9 +4,6 @@
@man man/man1/mysql_client_test.1
share/mysql-test/
share/mysql-test/README
-share/mysql-test/cacert.pem
-share/mysql-test/client-cert.pem
-share/mysql-test/client-key.pem
share/mysql-test/include/
share/mysql-test/include/add_anonymous_users.inc
share/mysql-test/include/analyze_failure_sync_with_master.test
@@ -28,6 +25,7 @@
share/mysql-test/include/have_bdb.inc
share/mysql-test/include/have_big5.inc
share/mysql-test/include/have_blackhole.inc
+share/mysql-test/include/have_bug25714.inc
share/mysql-test/include/have_case_sensitive_file_system.inc
share/mysql-test/include/have_compress.inc
share/mysql-test/include/have_cp1250_ch.inc
@@ -89,6 +87,7 @@
share/mysql-test/include/varchar.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
share/mysql-test/include/wait_for_slave_sql_to_stop.inc
share/mysql-test/include/wait_for_slave_to_start.inc
share/mysql-test/include/wait_for_slave_to_stop.inc
@@ -111,6 +110,7 @@
share/mysql-test/lib/mtr_timer.pl
share/mysql-test/lib/mtr_unique.pl
share/mysql-test/mtr
+share/mysql-test/mysql-stress-test.pl
share/mysql-test/mysql-test-run
share/mysql-test/mysql-test-run-shell
share/mysql-test/mysql-test-run.pl
@@ -121,6 +121,7 @@
share/mysql-test/r/analyse.result
share/mysql-test/r/analyze.result
share/mysql-test/r/ansi.result
+share/mysql-test/r/archive-big.result
share/mysql-test/r/archive.result
share/mysql-test/r/archive_gis.result
share/mysql-test/r/auto_increment.result
@@ -138,6 +139,7 @@
share/mysql-test/r/bigint.result
share/mysql-test/r/binary.result
share/mysql-test/r/binlog.result
+share/mysql-test/r/binlog_innodb.result
share/mysql-test/r/binlog_killed.result
share/mysql-test/r/blackhole.result
share/mysql-test/r/bool.result
@@ -162,6 +164,7 @@
share/mysql-test/r/create_not_windows.result
share/mysql-test/r/create_select_tmp.result
share/mysql-test/r/csv.result
+share/mysql-test/r/ctype_ascii.result
share/mysql-test/r/ctype_big5.result
share/mysql-test/r/ctype_collate.result
share/mysql-test/r/ctype_cp1250_ch.result
@@ -178,6 +181,7 @@
share/mysql-test/r/ctype_latin1_de.result
share/mysql-test/r/ctype_latin2.result
share/mysql-test/r/ctype_latin2_ch.result
+share/mysql-test/r/ctype_ldml.result
share/mysql-test/r/ctype_many.result
share/mysql-test/r/ctype_mb.result
share/mysql-test/r/ctype_recoding.result
@@ -208,6 +212,8 @@
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_innodb.result
share/mysql-test/r/fix_priv_tables.result
share/mysql-test/r/flush.result
share/mysql-test/r/flush2.result
@@ -218,6 +224,7 @@
share/mysql-test/r/foreign_key.result
share/mysql-test/r/fulltext.result
share/mysql-test/r/fulltext2.result
+share/mysql-test/r/fulltext3.result
share/mysql-test/r/fulltext_cache.result
share/mysql-test/r/fulltext_distinct.result
share/mysql-test/r/fulltext_left_join.result
@@ -266,6 +273,7 @@
share/mysql-test/r/have_bdb.require
share/mysql-test/r/have_big5.require
share/mysql-test/r/have_blackhole.require
+share/mysql-test/r/have_bug25714.require
share/mysql-test/r/have_compress.require
share/mysql-test/r/have_cp1250_ch.require
share/mysql-test/r/have_cp932.require
@@ -387,6 +395,7 @@
share/mysql-test/r/mysqlbinlog.result
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.result
share/mysql-test/r/mysqlshow.result
@@ -396,9 +405,11 @@
share/mysql-test/r/ndb_autodiscover.result
share/mysql-test/r/ndb_autodiscover2.result
share/mysql-test/r/ndb_autodiscover3.result
+share/mysql-test/r/ndb_backup_print.result
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_cache.result
share/mysql-test/r/ndb_cache2.result
share/mysql-test/r/ndb_cache_multi.result
@@ -424,6 +435,7 @@
share/mysql-test/r/ndb_rename.result
share/mysql-test/r/ndb_replace.result
share/mysql-test/r/ndb_restore.result
+share/mysql-test/r/ndb_restore_different_endian_data.result
share/mysql-test/r/ndb_restore_print.result
share/mysql-test/r/ndb_single_user.result
share/mysql-test/r/ndb_subquery.result
@@ -448,6 +460,7 @@
share/mysql-test/r/outfile.result
share/mysql-test/r/overflow.result
share/mysql-test/r/packet.result
+share/mysql-test/r/parser_precedence.result
share/mysql-test/r/perror.result
share/mysql-test/r/preload.result
share/mysql-test/r/profiling.result
@@ -465,6 +478,7 @@
share/mysql-test/r/query_cache.result
share/mysql-test/r/query_cache_merge.result
share/mysql-test/r/query_cache_notembedded.result
+share/mysql-test/r/query_cache_with_views.result
share/mysql-test/r/raid.result
share/mysql-test/r/range.result
share/mysql-test/r/read_only.result
@@ -514,6 +528,7 @@
share/mysql-test/r/rpl_flush_tables.result
share/mysql-test/r/rpl_free_items.result
share/mysql-test/r/rpl_get_lock.result
+share/mysql-test/r/rpl_grant.result
share/mysql-test/r/rpl_ignore_grant.result
share/mysql-test/r/rpl_ignore_revoke.result
share/mysql-test/r/rpl_ignore_table.result
@@ -602,7 +617,9 @@
share/mysql-test/r/sp_trans.result
share/mysql-test/r/sp_trans_log.result
share/mysql-test/r/sql_mode.result
+share/mysql-test/r/ssl-big.result
share/mysql-test/r/ssl.result
+share/mysql-test/r/ssl_8k_key.result
share/mysql-test/r/ssl_compress.result
share/mysql-test/r/ssl_connect.result
share/mysql-test/r/status.result
@@ -669,15 +686,14 @@
share/mysql-test/r/variables.result
share/mysql-test/r/view.result
share/mysql-test/r/view_grant.result
-share/mysql-test/r/view_query_cache.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/server-cert.pem
-share/mysql-test/server-key.pem
share/mysql-test/std_data/
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/bug15328.cnf
@@ -699,6 +715,20 @@
share/mysql-test/std_data/loaddata_dq.dat
share/mysql-test/std_data/loaddata_pair.dat
share/mysql-test/std_data/master-bin.000001
+share/mysql-test/std_data/ndb_backup50_data_be/
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
+share/mysql-test/std_data/ndb_backup50_data_le/
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
share/mysql-test/std_data/ndb_config_mycnf1.cnf
share/mysql-test/std_data/ndb_config_mycnf2.cnf
share/mysql-test/std_data/rpl_loaddata.dat
@@ -708,6 +738,8 @@
share/mysql-test/std_data/server-cert.pem
share/mysql-test/std_data/server-key-des.pem
share/mysql-test/std_data/server-key.pem
+share/mysql-test/std_data/server8k-cert.pem
+share/mysql-test/std_data/server8k-key.pem
share/mysql-test/std_data/trunc_binlog.000001
share/mysql-test/std_data/untrusted-cacert.pem
share/mysql-test/std_data/vchar.frm
@@ -773,6 +805,8 @@
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/datadict_help_tables_dev.result
share/mysql-test/suite/funcs_1/r/innodb__datadict.result
share/mysql-test/suite/funcs_1/r/innodb__load.result
share/mysql-test/suite/funcs_1/r/innodb_bitdata.result
@@ -846,6 +880,8 @@
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/datadict_help_tables_dev.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
@@ -946,93 +982,12 @@
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/row_lock/
-share/mysql-test/suite/row_lock/include/
-share/mysql-test/suite/row_lock/include/row_lock.inc
-share/mysql-test/suite/row_lock/include/row_lock_big_tab.inc
-share/mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
-share/mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
-share/mysql-test/suite/row_lock/include/row_lock_trig.inc
-share/mysql-test/suite/row_lock/include/row_lock_view.inc
-share/mysql-test/suite/row_lock/include/row_lock_view_mix.inc
-share/mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
-share/mysql-test/suite/row_lock/include/row_lock_view_trig.inc
-share/mysql-test/suite/row_lock/r/
-share/mysql-test/suite/row_lock/r/innodb_row_lock_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_3.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_4.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_5.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
-share/mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_3.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_4.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_5.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
-share/mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
-share/mysql-test/suite/row_lock/readme.txt
-share/mysql-test/suite/row_lock/summary_of_sel_test.txt
-share/mysql-test/suite/row_lock/t/
-share/mysql-test/suite/row_lock/t/innodb_row_lock_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_3.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_4.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_5.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
-share/mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_3.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_4.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_5.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
-share/mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.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/t/
share/mysql-test/t/alias.test
share/mysql-test/t/alter_table-big.test
@@ -1040,6 +995,7 @@
share/mysql-test/t/analyse.test
share/mysql-test/t/analyze.test
share/mysql-test/t/ansi.test
+share/mysql-test/t/archive-big.test
share/mysql-test/t/archive.test
share/mysql-test/t/archive_gis.test
share/mysql-test/t/auto_increment.test
@@ -1060,6 +1016,7 @@
share/mysql-test/t/binary.test
share/mysql-test/t/binlog-master.opt
share/mysql-test/t/binlog.test
+share/mysql-test/t/binlog_innodb.test
share/mysql-test/t/binlog_killed.test
share/mysql-test/t/blackhole.test
share/mysql-test/t/bool.test
@@ -1083,6 +1040,7 @@
share/mysql-test/t/create_not_windows.test
share/mysql-test/t/create_select_tmp.test
share/mysql-test/t/csv.test
+share/mysql-test/t/ctype_ascii.test
share/mysql-test/t/ctype_big5.test
share/mysql-test/t/ctype_collate.test
share/mysql-test/t/ctype_cp1250_ch.test
@@ -1100,6 +1058,8 @@
share/mysql-test/t/ctype_latin1_de.test
share/mysql-test/t/ctype_latin2.test
share/mysql-test/t/ctype_latin2_ch.test
+share/mysql-test/t/ctype_ldml-master.opt
+share/mysql-test/t/ctype_ldml.test
share/mysql-test/t/ctype_many.test
share/mysql-test/t/ctype_mb.test
share/mysql-test/t/ctype_recoding.test
@@ -1134,6 +1094,9 @@
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_innodb-slave.opt
+share/mysql-test/t/federated_innodb.test
share/mysql-test/t/fix_priv_tables.test
share/mysql-test/t/flush.test
share/mysql-test/t/flush2-master.opt
@@ -1146,6 +1109,7 @@
share/mysql-test/t/foreign_key.test
share/mysql-test/t/fulltext.test
share/mysql-test/t/fulltext2.test
+share/mysql-test/t/fulltext3.test
share/mysql-test/t/fulltext_cache.test
share/mysql-test/t/fulltext_distinct.test
share/mysql-test/t/fulltext_left_join.test
@@ -1308,6 +1272,8 @@
share/mysql-test/t/mysqlbinlog.test
share/mysql-test/t/mysqlbinlog2.test
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.test
share/mysql-test/t/mysqlshow.test
@@ -1318,9 +1284,11 @@
share/mysql-test/t/ndb_autodiscover2-master.opt
share/mysql-test/t/ndb_autodiscover2.test
share/mysql-test/t/ndb_autodiscover3.test
+share/mysql-test/t/ndb_backup_print.test
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_cache.test
share/mysql-test/t/ndb_cache2.test
share/mysql-test/t/ndb_cache_multi.test
@@ -1344,6 +1312,7 @@
share/mysql-test/t/ndb_rename.test
share/mysql-test/t/ndb_replace.test
share/mysql-test/t/ndb_restore.test
+share/mysql-test/t/ndb_restore_different_endian_data.test
share/mysql-test/t/ndb_restore_print.test
share/mysql-test/t/ndb_single_user.test
share/mysql-test/t/ndb_subquery.test
@@ -1366,6 +1335,7 @@
share/mysql-test/t/outfile.test
share/mysql-test/t/overflow.test
share/mysql-test/t/packet.test
+share/mysql-test/t/parser_precedence.test
share/mysql-test/t/perror.test
share/mysql-test/t/preload.test
share/mysql-test/t/profiling.test
@@ -1384,6 +1354,7 @@
share/mysql-test/t/query_cache.test
share/mysql-test/t/query_cache_merge.test
share/mysql-test/t/query_cache_notembedded.test
+share/mysql-test/t/query_cache_with_views.test
share/mysql-test/t/raid.test
share/mysql-test/t/range.test
share/mysql-test/t/read_only.test
@@ -1458,6 +1429,7 @@
share/mysql-test/t/rpl_free_items-slave.opt
share/mysql-test/t/rpl_free_items.test
share/mysql-test/t/rpl_get_lock.test
+share/mysql-test/t/rpl_grant.test
share/mysql-test/t/rpl_ignore_grant-slave.opt
share/mysql-test/t/rpl_ignore_grant.test
share/mysql-test/t/rpl_ignore_revoke-slave.opt
@@ -1582,7 +1554,9 @@
share/mysql-test/t/sp_trans.test
share/mysql-test/t/sp_trans_log.test
share/mysql-test/t/sql_mode.test
+share/mysql-test/t/ssl-big.test
share/mysql-test/t/ssl.test
+share/mysql-test/t/ssl_8k_key.test
share/mysql-test/t/ssl_compress.test
share/mysql-test/t/ssl_connect.test
share/mysql-test/t/status.test
@@ -1658,7 +1632,6 @@
share/mysql-test/t/variables.test
share/mysql-test/t/view.test
share/mysql-test/t/view_grant.test
-share/mysql-test/t/view_query_cache.test
share/mysql-test/t/wait_for_process.sh
share/mysql-test/t/wait_for_socket.sh
share/mysql-test/t/wait_timeout-master.opt
@@ -1666,4 +1639,6 @@
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