diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-22 13:41:10 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-22 13:41:10 -0700 |
| commit | c3a63238e6696f4b44fe7099e331471cebf7691b (patch) | |
| tree | 7ecb0a08914f64b500368cdf0bdb4a39f5365d20 /mysql-test/mysql-test-run.pl | |
| parent | ca589a4fc5220c54363181f23562c4d8e62d074d (diff) | |
| parent | dd6c12516e18802c5a1407f89de7976c186df2cb (diff) | |
| download | mariadb-git-c3a63238e6696f4b44fe7099e331471cebf7691b.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into siva.hindu.god:/usr/home/tim/m/bk/50
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 b6537c405c7..41377982af5 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; |