Commit 02903e63 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 

into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools


mysql-test/mysql-test-run.pl:
  Auto merged
parents 00121909 6108c2db

mysql-test/mysql-test-run.pl

+5 −5
Original line number Diff line number Diff line
@@ -1749,6 +1749,11 @@ sub environment_setup () { 
      print "Using IM_MYSQLD2_PORT       = $ENV{IM_MYSQLD2_PORT}\n";

    }

  }



  # Create an environment variable to make it possible

  # to detect that valgrind is being used from test cases

  $ENV{'VALGRIND_TEST'}= $opt_valgrind;



}
@@ -4009,11 +4014,6 @@ sub run_mysqltest ($) { 
    mtr_add_arg($args, "--big-test");

  }



  if ( $opt_valgrind )

  {

    mtr_add_arg($args, "--valgrind");

  }



  if ( $opt_compress )

  {

    mtr_add_arg($args, "--compress");