Commit b7fcc913 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 792ad914 3f01b5df

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ our $opt_sleep_time_for_delete= 10; 
our $opt_testcase_timeout;

our $opt_suite_timeout;

my  $default_testcase_timeout=     15; # 15 min max

my  $default_suite_timeout=       120; # 2 hours max

my  $default_suite_timeout=       180; # 3 hours max



our $opt_socket;