Commit eb146925 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 03e129fa 2430d73c

mysql-test/mysql-test-run.pl

+4 −1
Original line number Diff line number Diff line
@@ -754,7 +754,10 @@ sub command_line_setup () { 
  elsif ( $mysql_version_id < 50000 )

  {

    # --vardir was specified

    mtr_error("--vardir option not supported until MySQL 5.0");

    # It's only supported in 4.1 as a symlink from var/

    # by setting up $opt_mem that will be created

    $opt_mem= $opt_vardir;

    $opt_vardir= undef;

  }



  $path_vardir_trace= $opt_vardir;