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

mysql-test/mysql-test-run.pl:
  Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.

1 files changed, 12 insertions, 8 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index cd182e8fc73..19a2679d956 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2157,11 +2157,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");
@@ -2187,9 +2182,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
   # ----------------------------------------------------------------------
@@ -2204,6 +2196,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,"");
 }