From c34e5a9152723c4b8c92c538ee4cc3082b24ea00 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 4 May 2011 15:45:39 +0200 Subject: [PATCH 1/2] Avoid mtr warning on Windows during startup The reason for mtr warning is that collect_mysqld_features() starts mysqld with --datadir=/tmp and this directory does not exist on Windows. Fix : instead of passing --datadir=$opt_vardir/tmp in collect_mysqld_features() just use --datadir=. mysqld does not need a correct directory, just an existing one, as it is started with --help ---verbose -skip-grant-tables. --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0bf0245325a..f10f5e4fcba 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1697,7 +1697,7 @@ sub collect_mysqld_features { my $args; mtr_init_args(\$args); mtr_add_arg($args, "--no-defaults"); - mtr_add_arg($args, "--datadir=%s/tmp", $opt_vardir); + mtr_add_arg($args, "--datadir=."); mtr_add_arg($args, "--basedir=%s", $basedir); mtr_add_arg($args, "--language=%s", $path_language); mtr_add_arg($args, "--skip-grant-tables"); From aff371f662796e6313f39a163de858aaeb139d06 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 4 May 2011 16:03:52 +0200 Subject: [PATCH 2/2] Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2 into 5.1 --- mysql-test/include/maria_make_snapshot_for_comparison.inc | 1 + mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/mysql-test/include/maria_make_snapshot_for_comparison.inc b/mysql-test/include/maria_make_snapshot_for_comparison.inc index cb756f60527..0c71bd10408 100644 --- a/mysql-test/include/maria_make_snapshot_for_comparison.inc +++ b/mysql-test/include/maria_make_snapshot_for_comparison.inc @@ -8,6 +8,7 @@ # cover tables mysqltest.$mms_tname1,...$mms_tnameN connection admin; +--source include/wait_until_connected_again.inc let $mms_table_to_use=$mms_tables; let $mms_purpose=comparison; diff --git a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc index c204409de4d..8a2a99c28eb 100644 --- a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc +++ b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc @@ -11,6 +11,7 @@ connection admin; +--source include/wait_until_connected_again.inc let $mms_table_to_use=$mms_tables; let $mms_purpose=feeding_recovery;