diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-04 16:12:39 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-04 16:12:39 +0200 |
| commit | ca67f01baefbdc1e50ee3f7ca2bbe759d8017166 (patch) | |
| tree | 17ee547f7aaa99273736964a508a09e4ae8ccd76 /mysql-test | |
| parent | a9d14f5134b089aaf25acaed4c368f171150f640 (diff) | |
| parent | aff371f662796e6313f39a163de858aaeb139d06 (diff) | |
| download | mariadb-git-ca67f01baefbdc1e50ee3f7ca2bbe759d8017166.tar.gz | |
merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/maria_make_snapshot_for_comparison.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc | 1 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
3 files changed, 3 insertions, 1 deletions
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; 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"); |