Commit 533ce8cf authored by unknown's avatar unknown
Browse files

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 6de718d2 c537bbf8

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ our $opt_mark_progress; 
our $opt_skip;

our $opt_skip_rpl;

our $max_slave_num= 0;

our $max_master_num= 0;

our $max_master_num= 1;

our $use_innodb;

our $opt_skip_test;

our $opt_skip_im;