Commit 7443fed5 authored by unknown's avatar unknown
Browse files

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

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 8fb853ca 533ce8cf

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,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;