On Wed, Jan 10, 2007 at 04:22:42PM +0100, Frank Denis wrote:
> Le Wed, Jan 10, 2007 at 09:30:48AM +0100, Tomasz Pajor ecrivait :
> >There's a new version 5.0.33 fixing several bugfixes.
> >http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-33.html
>
> 5.0.33 is a future version, it's not released yet.
Actually even as you had posted this that was not true, 5.0.33
had been released the day before. Anyway, please try this out
and let me know how it goes.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.128
diff -u -p -r1.128 Makefile
--- Makefile 7 Dec 2006 11:42:37 -0000 1.128
+++ Makefile 15 Jan 2007 02:30:39 -0000
@@ -9,10 +9,10 @@ COMMENT-main= "multithreaded SQL databas
COMMENT-server= "multithreaded SQL database (server)"
COMMENT-tests= "multithreaded SQL database (regression test suite)"
-VERSION= 5.0.27
+VERSION= 5.0.33
DISTNAME= mysql-${VERSION}
-PKGNAME-main= mysql-client-${VERSION}p1
-PKGNAME-server= mysql-server-${VERSION}p0
+PKGNAME-main= mysql-client-${VERSION}
+PKGNAME-server= mysql-server-${VERSION}
PKGNAME-tests= mysql-tests-${VERSION}
CATEGORIES= databases
V= MySQL-5.0
@@ -104,6 +104,6 @@ post-install:
ln -sf mysql/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION} .
do-regress:
- @cd ${WRKSRC}/mysql-test && ./mysql-test-run --force
+ @cd ${WRKSRC}/mysql-test && ./mysql-test-run-shell --force
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo 29 Oct 2006 20:28:24 -0000 1.26
+++ distinfo 15 Jan 2007 02:16:54 -0000
@@ -1,4 +1,4 @@
-MD5 (mysql-5.0.27.tar.gz) = 584d423440a9d9c859678e3d4f2690b3
-RMD160 (mysql-5.0.27.tar.gz) = 3de75b959d04e002b2e4cfe322abdb48bf2f80fd
-SHA1 (mysql-5.0.27.tar.gz) = 656de9c03f07c2371f40277076ec2fc6eac51ec8
-SIZE (mysql-5.0.27.tar.gz) = 25867740
+MD5 (mysql-5.0.33.tar.gz) = 10cb85276a1468c7906a4ff4dd565d61
+RMD160 (mysql-5.0.33.tar.gz) = d4e195bba5e8eee43be2aa935c59e04e1a166fb5
+SHA1 (mysql-5.0.33.tar.gz) = 78893aa3f2fa7650dd013bd357b26d4ee3625c09
+SIZE (mysql-5.0.33.tar.gz) = 23045481
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-configure_in,v
retrieving revision 1.19
diff -u -p -r1.19 patch-configure_in
--- patches/patch-configure_in 14 Oct 2006 05:04:54 -0000 1.19
+++ patches/patch-configure_in 15 Jan 2007 02:40:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.19 2006/10/14 05:04:54 brad Exp $
---- configure.in.orig Wed Oct 4 07:24:11 2006
-+++ configure.in Thu Oct 12 05:19:50 2006
-@@ -453,44 +453,7 @@ AC_SUBST(MAKEINDEX)
+--- configure.in.orig Tue Jan 9 07:51:08 2007
++++ configure.in Sun Jan 14 21:29:24 2007
+@@ -457,44 +457,7 @@ AC_SUBST(ICHECK)
AC_PATH_PROG(PS, ps, ps)
AC_MSG_CHECKING("how to check if pid exists")
PS=$ac_cv_path_PS
@@ -47,7 +47,7 @@ $OpenBSD: patch-configure_in,v 1.19 2006
AC_SUBST(FIND_PROC)
AC_MSG_RESULT("$FIND_PROC")
-@@ -791,7 +754,8 @@ AC_ARG_WITH(libwrap,
+@@ -795,7 +758,8 @@ AC_ARG_WITH(libwrap,
AC_CHECK_HEADER(tcpd.h,
LIBS="-lwrap $LIBS"
AC_MSG_CHECKING(for TCP wrappers library -lwrap)
@@ -57,7 +57,7 @@ $OpenBSD: patch-configure_in,v 1.19 2006
int allow_severity = 0;
int deny_severity = 0;
-@@ -1555,7 +1519,7 @@ then
+@@ -1563,7 +1527,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
@@ -66,7 +66,7 @@ $OpenBSD: patch-configure_in,v 1.19 2006
esac
AC_CHECK_FUNCS(strtok_r pthread_init)
-@@ -1603,29 +1567,6 @@ case $SYSTEM_TYPE in
+@@ -1611,29 +1575,6 @@ case $SYSTEM_TYPE in
AC_SYS_RESTARTABLE_SYSCALLS
;;
esac
Index: patches/patch-mysql-test_Makefile_in
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-mysql-test_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-mysql-test_Makefile_in
--- patches/patch-mysql-test_Makefile_in 14 Oct 2006 05:04:54 -0000
1.12
+++ patches/patch-mysql-test_Makefile_in 15 Jan 2007 02:40:17 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.12 2006/10/14 05:04:54 brad Exp $
---- mysql-test/Makefile.in.orig Wed Oct 4 07:25:44 2006
-+++ mysql-test/Makefile.in Thu Oct 12 05:18:57 2006
-@@ -388,7 +388,7 @@ zlib_dir = @zlib_dir@
+--- mysql-test/Makefile.in.orig Tue Jan 9 07:52:50 2007
++++ mysql-test/Makefile.in Sun Jan 14 21:29:24 2007
+@@ -373,7 +373,7 @@ zlib_dir = @zlib_dir@
@[EMAIL PROTECTED] = ndb
@[EMAIL PROTECTED] = \"\"
@[EMAIL PROTECTED] = \"--ndbcluster\"
-benchdir_root = $(prefix)
+benchdir_root = $(datadir)
testdir = $(benchdir_root)/mysql-test
- EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp
$(PRESCRIPTS)
- EXTRA_DIST = $(EXTRA_SCRIPTS)
+ EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp
$(PRESCRIPTS)
+ EXTRA_DIST = $(EXTRA_SCRIPTS)
Index: patches/patch-mysql-test_mysql-test-run-shell_sh
===================================================================
RCS file: patches/patch-mysql-test_mysql-test-run-shell_sh
diff -N patches/patch-mysql-test_mysql-test-run-shell_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-mysql-test_mysql-test-run-shell_sh 15 Jan 2007 02:40:17
-0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- mysql-test/mysql-test-run-shell.sh.orig Sun Jan 14 21:30:07 2007
++++ mysql-test/mysql-test-run-shell.sh Sun Jan 14 21:30:20 2007
+@@ -101,7 +101,6 @@ sleep_until_file_created ()
+ loop=`expr $loop - 1`
+ done
+ echo "ERROR: $file was not created in $org_time seconds; Aborting"
+- exit 1;
+ }
+
+ # For the future
Index: patches/patch-mysql-test_mysql-test-run_sh
===================================================================
RCS file: patches/patch-mysql-test_mysql-test-run_sh
diff -N patches/patch-mysql-test_mysql-test-run_sh
--- patches/patch-mysql-test_mysql-test-run_sh 30 Apr 2006 20:55:44 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-mysql-test_mysql-test-run_sh,v 1.7 2006/04/30 20:55:44 brad
Exp $
---- mysql-test/mysql-test-run.sh.orig Fri Mar 31 12:10:41 2006
-+++ mysql-test/mysql-test-run.sh Mon Apr 17 01:25:23 2006
-@@ -101,7 +101,6 @@ sleep_until_file_created ()
- loop=`expr $loop - 1`
- done
- echo "ERROR: $file was not created in $org_time seconds; Aborting"
-- exit 1;
- }
-
- # For the future
Index: patches/patch-scripts_Makefile_in
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-scripts_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-scripts_Makefile_in
--- patches/patch-scripts_Makefile_in 14 Oct 2006 05:04:54 -0000 1.5
+++ patches/patch-scripts_Makefile_in 15 Jan 2007 02:40:16 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_Makefile_in,v 1.5 2006/10/14 05:04:54 brad Exp $
---- scripts/Makefile.in.orig Wed Oct 4 07:26:06 2006
-+++ scripts/Makefile.in Thu Oct 12 05:18:57 2006
-@@ -652,6 +652,7 @@ mysqlbug: ${top_builddir}/config.status
+--- scripts/Makefile.in.orig Tue Jan 9 07:53:16 2007
++++ scripts/Makefile.in Sun Jan 14 21:29:24 2007
+@@ -653,6 +653,7 @@ mysqlbug: ${top_builddir}/config.status
-e 's!@''datadir''@!$(datadir)!g' \
-e 's!@''localstatedir''@!$(localstatedir)!g' \
-e 's!@''libexecdir''@!$(libexecdir)!g' \
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.4
diff -u -p -r1.4 patch-scripts_mysql_install_db_sh
--- patches/patch-scripts_mysql_install_db_sh 14 Oct 2006 05:04:54 -0000
1.4
+++ patches/patch-scripts_mysql_install_db_sh 15 Jan 2007 03:08:22 -0000
@@ -1,12 +1,9 @@
$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.4 2006/10/14 05:04:54 brad Exp
$
---- scripts/mysql_install_db.sh.orig Wed Oct 4 07:24:11 2006
-+++ scripts/mysql_install_db.sh Thu Oct 12 05:18:57 2006
-@@ -7,10 +7,9 @@
- #
- # All unrecognized arguments to this script are passed to mysqld.
-
--in_rpm=0
--windows=0
+--- scripts/mysql_install_db.sh.orig Tue Jan 9 07:51:08 2007
++++ scripts/mysql_install_db.sh Sun Jan 14 22:07:48 2007
+@@ -10,7 +10,8 @@
+ in_rpm=0
+ windows=0
defaults=""
-user=""
+user=_mysql
@@ -14,97 +11,15 @@ $OpenBSD: patch-scripts_mysql_install_db
case "$1" in
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
-@@ -31,7 +30,6 @@ parse_arguments() {
-
- for arg do
- case "$arg" in
-- --force) force=1 ;;
- --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
- --ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
- --user=*)
-@@ -39,10 +37,9 @@ parse_arguments() {
+@@ -40,6 +41,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/^[^=]*=//'` ;;
+ --group=*) group=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ;;
-- --rpm) in_rpm=1 ;;
-- --windows) windows=1 ;;
- *)
- if test -n "$pick_args"
- then
-@@ -78,7 +75,6 @@ ldata=
- execdir=
- bindir=
- basedir=
--force=0
- verbose=0
- fill_help_tables=""
-
-@@ -127,44 +123,28 @@ mysqld=$execdir/mysqld
- mysqld_opt=""
- scriptdir=$bindir
-
--if test "$windows" = 1
--then
-- mysqld="./sql/mysqld"
-- mysqld_opt="--language=./sql/share/english"
-- scriptdir="./scripts"
--fi
--
- if test ! -x $mysqld
- then
-- if test "$in_rpm" = 1
-- then
- echo "FATAL ERROR $mysqld not found!"
- exit 1
-- else
-- echo "Didn't find $mysqld"
-- echo "You should do a 'make install' before executing this script"
-- exit 1
-- fi
- fi
-
- # Try to determine the hostname
- [EMAIL PROTECTED]@`
-
- # Check if hostname is valid
--if test "$windows" = 0 -a "$in_rpm" = 0 -a $force = 0
-+resolved=`$bindir/resolveip $hostname 2>&1`
-+if [ $? -ne 0 ]
- then
-- resolved=`$bindir/resolveip $hostname 2>&1`
-- if [ $? -ne 0 ]
-- then
- resolved=`$bindir/resolveip localhost 2>&1`
- if [ $? -ne 0 ]
-- then
-- echo "Neither host '$hostname' nor 'localhost' could be looked up with"
-- echo "$bindir/resolveip"
-- echo "Please configure the 'hostname' command to return a correct
hostname."
-- echo "If you want to solve this at a later stage, restart this script
with"
-- echo "the --force option"
-- exit 1
-+ then
-+ echo "Neither host '$hostname' nor 'localhost' could be looked up with"
-+ echo "$bindir/resolveip"
-+ echo "Please configure the 'hostname' command to return a correct
hostname."
-+ echo "If you want to solve this at a later stage, restart this script
with"
-+ echo "the --force option"
-+ exit 1
- fi
- echo "WARNING: The host '$hostname' could not be looked up with
resolveip."
- echo "This probably means that your libc libraries are not 100 %
compatible"
-@@ -172,7 +152,6 @@ then
- echo "normally with the exception that host name resolving will not work."
- echo "This means that you should use IP addresses instead of hostnames"
- echo "when specifying MySQL privileges !"
-- fi
- fi
-
- if test "$ip_only" = "1"
-@@ -183,12 +162,10 @@ fi
+ --rpm) in_rpm=1 ;;
+@@ -197,12 +199,10 @@ fi
# Create database directories mysql & test
@@ -114,38 +29,14 @@ $OpenBSD: patch-scripts_mysql_install_db
- if test -w / -a ! -z "$user"; then
- chown $user $ldata $ldata/mysql $ldata/test;
- fi
-+if test ! -d $ldata; then mkdir -p $ldata; chmod 700 $ldata ; fi
-+if test ! -d $ldata/mysql; then mkdir -p $ldata/mysql; chmod 700
$ldata/mysql ; fi
-+if test ! -d $ldata/test; then mkdir -p $ldata/test; chmod 700 $ldata/test ;
fi
-+chown -f $user:$group $ldata $ldata/mysql $ldata/test;
++ if test ! -d $ldata; then mkdir -p $ldata; chmod 700 $ldata ; fi
++ if test ! -d $ldata/mysql; then mkdir -p $ldata/mysql; chmod 700
$ldata/mysql ; fi
++ if test ! -d $ldata/test; then mkdir -p $ldata/test; chmod 700 $ldata/test
; fi
++ chown -f $user:$group $ldata $ldata/mysql $ldata/test;
if test ! -f $mdata/db.frm
then
-@@ -206,10 +183,7 @@ if test -n "$user"; then
- args="$args --user=$user"
- fi
-
--if test "$in_rpm" -eq 0 -a "$windows" -eq 0
--then
-- echo "Installing all prepared tables"
--fi
-+echo "Installing all prepared tables"
- mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
- --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
- --skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M
--net_buffer_length=16K"
-@@ -218,10 +192,7 @@ if $scriptdir/mysql_create_system_tables
- then
- if test -n "$fill_help_tables"
- then
-- if test "$in_rpm" -eq 0 -a "$windows" -eq 0
-- then
-- echo "Fill help tables"
-- fi
-+ echo "Fill help tables"
- (echo "use mysql;"; cat $fill_help_tables) | eval
"$mysqld_install_cmd_line"
- res=$?
- if test $res != 0
-@@ -232,15 +203,6 @@ then
+@@ -246,13 +246,6 @@ then
echo ""
fi
fi
@@ -156,12 +47,10 @@ $OpenBSD: patch-scripts_mysql_install_db
- echo "to the right place for your system"
- echo
- fi
-- if test "$windows" -eq 0
-- then
+ if test "$windows" -eq 0
+ then
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
- echo "To do so, start the server, then issue the following commands:"
- echo "$bindir/mysqladmin -u root password 'new-password'"
-@@ -256,21 +218,11 @@ then
+@@ -270,15 +263,6 @@ then
echo "able to use the new GRANT command!"
fi
echo
@@ -177,9 +66,3 @@ $OpenBSD: patch-scripts_mysql_install_db
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
echo
echo "The latest information about MySQL is available on the web at"
- echo "http://www.mysql.com";
- echo "Support MySQL by buying support/licenses at http://shop.mysql.com";
-- fi
- exit 0
- else
- echo "Installation of system tables failed!"
Index: patches/patch-sql_mysqld_cc
===================================================================
RCS file: /cvs/ports/databases/mysql/patches/patch-sql_mysqld_cc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-sql_mysqld_cc
--- patches/patch-sql_mysqld_cc 14 Oct 2006 05:04:54 -0000 1.6
+++ patches/patch-sql_mysqld_cc 15 Jan 2007 02:40:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-sql_mysqld_cc,v 1.6 2006/10/14 05:04:54 brad Exp $
---- sql/mysqld.cc.orig Wed Oct 4 07:24:09 2006
-+++ sql/mysqld.cc Thu Oct 12 05:18:57 2006
-@@ -3377,7 +3377,7 @@ int main(int argc, char **argv)
+--- sql/mysqld.cc.orig Tue Jan 9 07:51:07 2007
++++ sql/mysqld.cc Sun Jan 14 21:29:24 2007
+@@ -3418,7 +3418,7 @@ int main(int argc, char **argv)
init_ssl();
#ifdef HAVE_LIBWRAP
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 7 Dec 2006 11:42:37 -0000 1.2
+++ pkg/PLIST-main 15 Jan 2007 04:09:04 -0000
@@ -55,6 +55,7 @@ lib/mysql/libmysqlclient_r.la
%%SHARED%%
@man man/man1/mysql.1
@man man/man1/mysql_config.1
[EMAIL PROTECTED] man/man1/mysql_tzinfo_to_sql.1
@man man/man1/mysqladmin.1
@man man/man1/mysqlbinlog.1
@man man/man1/mysqlcheck.1
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-server,v
retrieving revision 1.24
diff -u -p -r1.24 PLIST-server
--- pkg/PLIST-server 18 Oct 2006 18:35:48 -0000 1.24
+++ pkg/PLIST-server 15 Jan 2007 04:09:25 -0000
@@ -41,6 +41,7 @@ lib/mysql/libvio.a
libexec/mysqld
libexec/mysqlmanager
@man man/man1/msql2mysql.1
[EMAIL PROTECTED] man/man1/my_print_defaults.1
@man man/man1/myisam_ftdump.1
@man man/man1/myisamchk.1
@man man/man1/myisamlog.1
@@ -51,11 +52,9 @@ libexec/mysqlmanager
@man man/man1/mysql_upgrade.1
@man man/man1/mysql_zap.1
@man man/man1/mysqlaccess.1
[EMAIL PROTECTED] man/man1/mysqld.1
@man man/man1/mysqld_multi.1
@man man/man1/mysqld_safe.1
@man man/man1/mysqlhotcopy.1
[EMAIL PROTECTED] man/man1/mysqlmanager.1
@man man/man1/perror.1
@man man/man1/replace.1
@man man/man1/safe_mysqld.1
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/databases/mysql/pkg/PLIST-tests,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST-tests
--- pkg/PLIST-tests 14 Oct 2006 05:04:54 -0000 1.21
+++ pkg/PLIST-tests 15 Jan 2007 04:09:25 -0000
@@ -5,7 +5,9 @@ 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/analyze_failure_sync_with_master.test
share/mysql-test/include/big_test.inc
+share/mysql-test/include/check-testcase.test
share/mysql-test/include/check_var_limit.inc
share/mysql-test/include/common-tests.inc
share/mysql-test/include/ctype_common.inc
@@ -49,11 +51,11 @@ share/mysql-test/include/have_ucs2.inc
share/mysql-test/include/have_udf.inc
share/mysql-test/include/have_ujis.inc
share/mysql-test/include/im_check_env.inc
+share/mysql-test/include/innodb_rollback_on_timeout.inc
share/mysql-test/include/is_debug_build.inc
share/mysql-test/include/loaddata_autocom.inc
share/mysql-test/include/master-slave.inc
share/mysql-test/include/mysqltest-x.inc
-share/mysql-test/include/mysqltest_while.inc
share/mysql-test/include/ndb_default_cluster.inc
share/mysql-test/include/not_as_root.inc
share/mysql-test/include/not_embedded.inc
@@ -65,17 +67,17 @@ share/mysql-test/include/ps_modify.inc
share/mysql-test/include/ps_modify1.inc
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_msg.inc
share/mysql-test/include/show_msg80.inc
-share/mysql-test/include/sourced.inc
-share/mysql-test/include/sourced1.inc
share/mysql-test/include/sp-vars.inc
share/mysql-test/include/strict_autoinc.inc
share/mysql-test/include/system_db_struct.inc
share/mysql-test/include/test_outfile.inc
share/mysql-test/include/testdb_only.inc
share/mysql-test/include/varchar.inc
+share/mysql-test/include/wait_for_query_to_suceed.inc
share/mysql-test/include/wait_slave_status.inc
share/mysql-test/include/windows.inc
share/mysql-test/install_test_db
@@ -85,6 +87,7 @@ share/mysql-test/lib/mtr_cases.pl
share/mysql-test/lib/mtr_diff.pl
share/mysql-test/lib/mtr_gcov.pl
share/mysql-test/lib/mtr_gprof.pl
+share/mysql-test/lib/mtr_im.pl
share/mysql-test/lib/mtr_io.pl
share/mysql-test/lib/mtr_match.pl
share/mysql-test/lib/mtr_misc.pl
@@ -92,8 +95,10 @@ share/mysql-test/lib/mtr_process.pl
share/mysql-test/lib/mtr_report.pl
share/mysql-test/lib/mtr_stress.pl
share/mysql-test/lib/mtr_timer.pl
+share/mysql-test/lib/mtr_unique.pl
share/mysql-test/mtr
share/mysql-test/mysql-test-run
+share/mysql-test/mysql-test-run-shell
share/mysql-test/mysql-test-run.pl
share/mysql-test/r/
share/mysql-test/r/alias.result
@@ -179,11 +184,15 @@ share/mysql-test/r/empty_table.result
share/mysql-test/r/endspace.result
share/mysql-test/r/errors.result
share/mysql-test/r/exampledb.result
+share/mysql-test/r/execution_constants.result
share/mysql-test/r/explain.result
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/fix_priv_tables.result
+share/mysql-test/r/fix_priv_tabs.result
share/mysql-test/r/flush.result
+share/mysql-test/r/flush2.result
share/mysql-test/r/flush_block_commit.result
share/mysql-test/r/flush_read_lock_kill.result
share/mysql-test/r/flush_table.result
@@ -255,6 +264,7 @@ share/mysql-test/r/have_innodb.require
share/mysql-test/r/have_latin2_ch.require
share/mysql-test/r/have_met_timezone.require
share/mysql-test/r/have_moscow_leap_timezone.require
+share/mysql-test/r/have_mysql_upgrade.result
share/mysql-test/r/have_ndb.require
share/mysql-test/r/have_ndb_status_ok.require
share/mysql-test/r/have_openssl.require
@@ -302,6 +312,7 @@ share/mysql-test/r/innodb_gis.result
share/mysql-test/r/innodb_handler.result
share/mysql-test/r/innodb_mysql.result
share/mysql-test/r/innodb_notembedded.result
+share/mysql-test/r/innodb_timeout_rollback.result
share/mysql-test/r/innodb_unsafe_binlog.result
share/mysql-test/r/insert.result
share/mysql-test/r/insert_select-binlog.result
@@ -345,6 +356,8 @@ share/mysql-test/r/myisam.result
share/mysql-test/r/mysql.result
share/mysql-test/r/mysql_client_test.result
share/mysql-test/r/mysql_protocols.result
+share/mysql-test/r/mysql_upgrade.result
+share/mysql-test/r/mysqladmin.result
share/mysql-test/r/mysqlbinlog.result
share/mysql-test/r/mysqlbinlog2.result
share/mysql-test/r/mysqlcheck.result
@@ -430,6 +443,7 @@ share/mysql-test/r/rename.result
share/mysql-test/r/repair.result
share/mysql-test/r/replace.result
share/mysql-test/r/rollback.result
+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
@@ -446,12 +460,10 @@ share/mysql-test/r/rpl000012.result
share/mysql-test/r/rpl000013.result
share/mysql-test/r/rpl000015.result
share/mysql-test/r/rpl000017.result
-share/mysql-test/r/rpl000018.result
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_chain_temp_table.result
share/mysql-test/r/rpl_change_master.result
share/mysql-test/r/rpl_charset.result
share/mysql-test/r/rpl_commit_after_flush.result
@@ -467,12 +479,10 @@ share/mysql-test/r/rpl_dual_pos_advance.
share/mysql-test/r/rpl_empty_master_crash.result
share/mysql-test/r/rpl_error_ignored_table.result
share/mysql-test/r/rpl_failed_optimize.result
-share/mysql-test/r/rpl_failsafe.result
share/mysql-test/r/rpl_flush_log_loop.result
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_heap.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
@@ -502,6 +512,7 @@ share/mysql-test/r/rpl_mystery22.result
share/mysql-test/r/rpl_ndb_innodb_trans.result
share/mysql-test/r/rpl_openssl.result
share/mysql-test/r/rpl_optimize.result
+share/mysql-test/r/rpl_packet.result
share/mysql-test/r/rpl_ps.result
share/mysql-test/r/rpl_redirect.result
share/mysql-test/r/rpl_relayrotate.result
@@ -554,6 +565,7 @@ share/mysql-test/r/sp_trans.result
share/mysql-test/r/sql_mode.result
share/mysql-test/r/ssl.result
share/mysql-test/r/ssl_compress.result
+share/mysql-test/r/ssl_des.result
share/mysql-test/r/status.result
share/mysql-test/r/strict.result
share/mysql-test/r/strict_autoinc_1myisam.result
@@ -563,6 +575,7 @@ share/mysql-test/r/strict_autoinc_4bdb.r
share/mysql-test/r/strict_autoinc_5ndb.result
share/mysql-test/r/subselect.result
share/mysql-test/r/subselect2.result
+share/mysql-test/r/subselect3.result
share/mysql-test/r/subselect_gis.result
share/mysql-test/r/subselect_innodb.result
share/mysql-test/r/subselect_notembedded.result
@@ -579,6 +592,7 @@ share/mysql-test/r/testdb_only.require
share/mysql-test/r/timezone.result
share/mysql-test/r/timezone2.result
share/mysql-test/r/timezone3.result
+share/mysql-test/r/timezone4.result
share/mysql-test/r/timezone_grant.result
share/mysql-test/r/trigger-compat.result
share/mysql-test/r/trigger-grant.result
@@ -625,8 +639,12 @@ share/mysql-test/server-key.pem
share/mysql-test/std_data/
share/mysql-test/std_data/14897.frm
share/mysql-test/std_data/Moscow_leap
+share/mysql-test/std_data/bad_gis_data.dat
share/mysql-test/std_data/bug15328.cnf
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/cacert.pem
share/mysql-test/std_data/client-cert.pem
share/mysql-test/std_data/client-key.pem
@@ -645,7 +663,9 @@ share/mysql-test/std_data/ndb_config_myc
share/mysql-test/std_data/rpl_loaddata.dat
share/mysql-test/std_data/rpl_loaddata2.dat
share/mysql-test/std_data/rpl_timezone.dat
+share/mysql-test/std_data/server-cert-des.pem
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/trunc_binlog.000001
share/mysql-test/std_data/untrusted-cacert.pem
@@ -742,11 +762,15 @@ share/mysql-test/t/empty_table.test
share/mysql-test/t/endspace.test
share/mysql-test/t/errors.test
share/mysql-test/t/exampledb.test
+share/mysql-test/t/execution_constants.test
share/mysql-test/t/explain.test
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/fix_priv_tables.test
share/mysql-test/t/flush.test
+share/mysql-test/t/flush2-master.opt
+share/mysql-test/t/flush2.test
share/mysql-test/t/flush_block_commit.test
share/mysql-test/t/flush_read_lock_kill-master.opt
share/mysql-test/t/flush_read_lock_kill.test
@@ -838,8 +862,11 @@ share/mysql-test/t/innodb_cache-master.o
share/mysql-test/t/innodb_cache.test
share/mysql-test/t/innodb_gis.test
share/mysql-test/t/innodb_handler.test
+share/mysql-test/t/innodb_mysql-master.opt
share/mysql-test/t/innodb_mysql.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_unsafe_binlog-master.opt
share/mysql-test/t/innodb_unsafe_binlog.test
share/mysql-test/t/insert.test
@@ -866,6 +893,7 @@ share/mysql-test/t/lock.test
share/mysql-test/t/lock_multi.test
share/mysql-test/t/lock_tables_lost_commit-master.opt
share/mysql-test/t/lock_tables_lost_commit.test
+share/mysql-test/t/log.sh
share/mysql-test/t/lowercase_fs_off.test
share/mysql-test/t/lowercase_table-master.opt
share/mysql-test/t/lowercase_table.test
@@ -893,8 +921,11 @@ 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_delimiter.sql
+share/mysql-test/t/mysql_delimiter_19799.sql
share/mysql-test/t/mysql_delimiter_source.sql
share/mysql-test/t/mysql_protocols.test
+share/mysql-test/t/mysql_upgrade.test
+share/mysql-test/t/mysqladmin.test
share/mysql-test/t/mysqlbinlog-master.opt
share/mysql-test/t/mysqlbinlog.test
share/mysql-test/t/mysqlbinlog2.test
@@ -957,6 +988,7 @@ share/mysql-test/t/overflow.test
share/mysql-test/t/packet.test
share/mysql-test/t/perror.test
share/mysql-test/t/preload.test
+share/mysql-test/t/ps-master.opt
share/mysql-test/t/ps.test
share/mysql-test/t/ps_10nestset.test
share/mysql-test/t/ps_11bugs.test
@@ -978,6 +1010,7 @@ share/mysql-test/t/rename.test
share/mysql-test/t/repair.test
share/mysql-test/t/replace.test
share/mysql-test/t/rollback.test
+share/mysql-test/t/round.test
share/mysql-test/t/row.test
share/mysql-test/t/rowid_order_bdb.test
share/mysql-test/t/rowid_order_innodb.test
@@ -1005,13 +1038,11 @@ share/mysql-test/t/rpl000017-slave.sh
share/mysql-test/t/rpl000017.test
share/mysql-test/t/rpl000018-master.opt
share/mysql-test/t/rpl000018-slave.opt
-share/mysql-test/t/rpl000018.test
share/mysql-test/t/rpl_EE_error.test
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_chain_temp_table.test
share/mysql-test/t/rpl_change_master.test
share/mysql-test/t/rpl_charset.test
share/mysql-test/t/rpl_commit_after_flush.test
@@ -1029,12 +1060,12 @@ share/mysql-test/t/rpl_drop_temp-slave.o
share/mysql-test/t/rpl_drop_temp.test
share/mysql-test/t/rpl_dual_pos_advance-master.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
share/mysql-test/t/rpl_error_ignored_table-slave.opt
share/mysql-test/t/rpl_error_ignored_table.test
share/mysql-test/t/rpl_failed_optimize-master.opt
share/mysql-test/t/rpl_failed_optimize.test
-share/mysql-test/t/rpl_failsafe.test
share/mysql-test/t/rpl_flush_log_loop-master.opt
share/mysql-test/t/rpl_flush_log_loop-master.sh
share/mysql-test/t/rpl_flush_log_loop-slave.opt
@@ -1044,7 +1075,6 @@ share/mysql-test/t/rpl_flush_tables.test
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_heap.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
@@ -1090,6 +1120,9 @@ share/mysql-test/t/rpl_ndb_innodb_trans-
share/mysql-test/t/rpl_ndb_innodb_trans.test
share/mysql-test/t/rpl_openssl.test
share/mysql-test/t/rpl_optimize.test
+share/mysql-test/t/rpl_packet-master.opt
+share/mysql-test/t/rpl_packet-slave.opt
+share/mysql-test/t/rpl_packet.test
share/mysql-test/t/rpl_ps.test
share/mysql-test/t/rpl_redirect.test
share/mysql-test/t/rpl_relayrotate-slave.opt
@@ -1138,6 +1171,7 @@ 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/show_check-master.opt
share/mysql-test/t/show_check.test
share/mysql-test/t/skip_grants-master.opt
share/mysql-test/t/skip_grants.test
@@ -1158,6 +1192,8 @@ share/mysql-test/t/sp_trans.test
share/mysql-test/t/sql_mode.test
share/mysql-test/t/ssl.test
share/mysql-test/t/ssl_compress.test
+share/mysql-test/t/ssl_des-master.opt
+share/mysql-test/t/ssl_des.test
share/mysql-test/t/status.test
share/mysql-test/t/strict.test
share/mysql-test/t/strict_autoinc_1myisam.test
@@ -1167,6 +1203,7 @@ share/mysql-test/t/strict_autoinc_4bdb.t
share/mysql-test/t/strict_autoinc_5ndb.test
share/mysql-test/t/subselect.test
share/mysql-test/t/subselect2.test
+share/mysql-test/t/subselect3.test
share/mysql-test/t/subselect_gis.test
share/mysql-test/t/subselect_innodb.test
share/mysql-test/t/subselect_notembedded.test
@@ -1177,8 +1214,10 @@ share/mysql-test/t/synchronization.test
share/mysql-test/t/sysdate_is_now-master.opt
share/mysql-test/t/sysdate_is_now.test
share/mysql-test/t/system_mysql_db.test
-share/mysql-test/t/system_mysql_db_fix-master.opt
-share/mysql-test/t/system_mysql_db_fix.test
+share/mysql-test/t/system_mysql_db_fix30020-master.opt
+share/mysql-test/t/system_mysql_db_fix30020.test
+share/mysql-test/t/system_mysql_db_fix40123-master.opt
+share/mysql-test/t/system_mysql_db_fix40123.test
share/mysql-test/t/system_mysql_db_refs.test
share/mysql-test/t/tablelock.test
share/mysql-test/t/temp_table-master.opt
@@ -1188,6 +1227,8 @@ share/mysql-test/t/timezone.test
share/mysql-test/t/timezone2.test
share/mysql-test/t/timezone3-master.opt
share/mysql-test/t/timezone3.test
+share/mysql-test/t/timezone4-master.opt
+share/mysql-test/t/timezone4.test
share/mysql-test/t/timezone_grant.test
share/mysql-test/t/trigger-compat.test
share/mysql-test/t/trigger-grant.test
@@ -1220,12 +1261,14 @@ share/mysql-test/t/update.test
share/mysql-test/t/user_limits.test
share/mysql-test/t/user_var-binlog.test
share/mysql-test/t/user_var.test
+share/mysql-test/t/utils.sh
share/mysql-test/t/varbinary.test
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
share/mysql-test/t/wait_timeout.test
share/mysql-test/t/warnings-master.opt
