database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Don't add all args to mysqltest to MYSQL_TEST env var

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2005-09-21 10:24:46 +02:00
parent a26e1b7280
commit f6b8032af5
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2157,11 +2157,6 @@ sub run_mysqltest ($) {
mtr_add_arg($args, "--big-test"); mtr_add_arg($args, "--big-test");
} }
if ( $opt_record )
{
mtr_add_arg($args, "--record");
}
if ( $opt_compress ) if ( $opt_compress )
{ {
mtr_add_arg($args, "--compress"); mtr_add_arg($args, "--compress");
@@ -2187,9 +2182,6 @@ sub run_mysqltest ($) {
$glob_mysql_test_dir); $glob_mysql_test_dir);
} }
mtr_add_arg($args, "-R");
mtr_add_arg($args, $tinfo->{'result_file'});
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# If embedded server, we create server args to give mysqltest to pass on # If embedded server, we create server args to give mysqltest to pass on
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@@ -2204,6 +2196,18 @@ sub run_mysqltest ($) {
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
$ENV{'MYSQL_TEST'}= "$exe_mysqltest " . join(" ", @$args); $ENV{'MYSQL_TEST'}= "$exe_mysqltest " . join(" ", @$args);
# ----------------------------------------------------------------------
# Add args that should not go into the MYSQL_TEST environment var
# ----------------------------------------------------------------------
mtr_add_arg($args, "-R");
mtr_add_arg($args, $tinfo->{'result_file'});
if ( $opt_record )
{
mtr_add_arg($args, "--record");
}
return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,""); return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
} }