Commit e703227a authored by unknown's avatar unknown
Browse files

Fix merge conflicts

parent 87e30475

mysql-test/mysql-test-run.pl

+1 −2
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ our $opt_fast; 
our $opt_force;

our $opt_reorder= 0;

our $opt_enable_disabled;

our $opt_report_features;

our $opt_mem= $ENV{'MTR_MEM'};



our $opt_gcov;
@@ -656,7 +655,7 @@ sub command_line_setup () { 
  # directory. And we install "/usr/share/mysql-test". Moving up one

  # more directory relative to "mysql-test" gives us a usable base

  # directory for RPM installs.

  if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" )

  if ( ! $source_dist and ! -d "$glob_basedir/bin" )

  {

    $glob_basedir= dirname($glob_basedir);

  }