Commit bd18a1ad authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents e1c17c65 7695cab8

mysql-test/mysql-test-run.pl

+6 −6
Original line number Diff line number Diff line
@@ -240,8 +240,6 @@ our $opt_suite_timeout; 
my  $default_testcase_timeout=     15; # 15 min max

my  $default_suite_timeout=       180; # 3 hours max



our $opt_source_dist;



our $opt_start_and_exit;

our $opt_start_dirty;

our $opt_start_from;
@@ -301,6 +299,8 @@ our $glob_tot_real_time= 0; 


our %mysqld_variables;



my $source_dist= 0;





######################################################################

#
@@ -634,7 +634,7 @@ sub command_line_setup () { 


  if ( -d "../sql" )

  {

    $opt_source_dist=  1;

    $source_dist=  1;

  }



  $glob_hostname=  mtr_short_hostname();
@@ -670,7 +670,7 @@ sub command_line_setup () { 
    unless -d $glob_mysql_bench_dir;



  $path_my_basedir=

    $opt_source_dist ? $glob_mysql_test_dir : $glob_basedir;

    $source_dist ? $glob_mysql_test_dir : $glob_basedir;



  $glob_timers= mtr_init_timers();
@@ -933,7 +933,7 @@ sub command_line_setup () { 
  # --------------------------------------------------------------------------

  # Gcov flag

  # --------------------------------------------------------------------------

  if ( $opt_gcov and ! $opt_source_dist )

  if ( $opt_gcov and ! $source_dist )

  {

    mtr_error("Coverage test needs the source - please use source dist");

  }
@@ -1598,7 +1598,7 @@ sub environment_setup () { 
  # Setup LD_LIBRARY_PATH so the libraries from this distro/clone

  # are used in favor of the system installed ones

  # --------------------------------------------------------------------------

  if ( $opt_source_dist )

  if ( $source_dist )

  {

    push(@ld_library_paths, "$glob_basedir/libmysql/.libs/",

                            "$glob_basedir/libmysql_r/.libs/");