Commit 7c0ba8e1 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
parents d3f9ea0c 4600fc3f

mysql-test/mysql-test-run.pl

+10 −2
Original line number Diff line number Diff line
@@ -1378,7 +1378,15 @@ sub datadir_list_setup () { 


sub collect_mysqld_features () {

  my $found_variable_list_start= 0;

  my $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function

  my $tmpdir;

  if ( $opt_tmpdir ) {

    # Use the requested tmpdir

    mkpath($opt_tmpdir) if (! -d $opt_tmpdir);

    $tmpdir= $opt_tmpdir;

  }

  else {

    $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function

  }



  #

  # Execute "mysqld --no-defaults --help --verbose" to get a
@@ -1439,7 +1447,7 @@ sub collect_mysqld_features () { 
      }

    }

  }

  rmtree($tmpdir);

  rmtree($tmpdir) if (!$opt_tmpdir);

  mtr_error("Could not find version of MySQL") unless $mysql_version_id;

  mtr_error("Could not find variabes list") unless $found_variable_list_start;