diff options
author | unknown <msvensson@pilot.mysql.com> | 2006-12-22 10:00:12 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.mysql.com> | 2006-12-22 10:00:12 +0100 |
commit | 533ce8cf251eb33e4bb6e3aef2e9747fc838fbf4 (patch) | |
tree | 15fe12b88450d676e80eb81b064c9b7f25555097 /mysql-test/mysql-test-run.pl | |
parent | 6de718d22ab1ee974c6c4eb84387e43da356a1fa (diff) | |
parent | c537bbf8ef0c242a55d3c6c961ffaf38bb269a50 (diff) | |
download | mariadb-git-533ce8cf251eb33e4bb6e3aef2e9747fc838fbf4.tar.gz |
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
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 48eb9eda51e..bf5915cfc1c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; |