1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Vladislav Vaintroub 2011-05-04 16:12:39 +02:00
commit ca67f01bae
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/maria_make_snapshot_for_comparison.inc
View File

@ -8,6 +8,7 @@
# cover tables mysqltest.$mms_tname1,...$mms_tnameN # cover tables mysqltest.$mms_tname1,...$mms_tnameN
connection admin; connection admin;
--source include/wait_until_connected_again.inc
let $mms_table_to_use=$mms_tables; let $mms_table_to_use=$mms_tables;
let $mms_purpose=comparison; let $mms_purpose=comparison;

1
mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
View File

@ -11,6 +11,7 @@
connection admin; connection admin;
--source include/wait_until_connected_again.inc
let $mms_table_to_use=$mms_tables; let $mms_table_to_use=$mms_tables;
let $mms_purpose=feeding_recovery; let $mms_purpose=feeding_recovery;

2
mysql-test/mysql-test-run.pl
View File

@ -1697,7 +1697,7 @@ sub collect_mysqld_features {
my $args; my $args;
mtr_init_args(\$args); mtr_init_args(\$args);
mtr_add_arg($args, "--no-defaults"); 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, "--basedir=%s", $basedir);
mtr_add_arg($args, "--language=%s", $path_language); mtr_add_arg($args, "--language=%s", $path_language);
mtr_add_arg($args, "--skip-grant-tables"); mtr_add_arg($args, "--skip-grant-tables");