diff options
author | unknown <serg@serg.mylan> | 2005-09-21 13:53:22 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-09-21 13:53:22 +0200 |
commit | 02ee24a8c284063b6a9bd8357465584ce7d4e0a2 (patch) | |
tree | 29a5373cf28e87e844da3557b032013adcdbcbe8 /mysql-test/mysql-test-run.pl | |
parent | e6e4003d57f706a5c256de230c7466d62d2027d3 (diff) | |
parent | f7918883f9c2274617a8d000502cdec3dab48509 (diff) | |
download | mariadb-git-02ee24a8c284063b6a9bd8357465584ce7d4e0a2.tar.gz |
merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/mysys/mysys_ia64.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/rpl_multi_delete2.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
Auto merged
mysql-test/t/rpl_multi_delete2.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0343c19036d..2dda1b2a6e1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2450,11 +2450,6 @@ sub run_mysqltest ($) { mtr_add_arg($args, "--big-test"); } - if ( $opt_record ) - { - mtr_add_arg($args, "--record"); - } - if ( $opt_compress ) { mtr_add_arg($args, "--compress"); @@ -2480,9 +2475,6 @@ sub run_mysqltest ($) { $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 # ---------------------------------------------------------------------- @@ -2497,6 +2489,18 @@ sub run_mysqltest ($) { # ---------------------------------------------------------------------- $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,""); } |