diff options
| author | unknown <kent@mysql.com> | 2005-03-22 15:57:20 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-03-22 15:57:20 +0100 |
| commit | 3a88de432160d0aa9bfb1cf6e8d3c4febd0eff71 (patch) | |
| tree | e26595c02514371b83a9e5405a9cca83a897f2dc /mysql-test/mysql-test-run.sh | |
| parent | bac0698065f605eb43981e23903241f6eb27e2b7 (diff) | |
| parent | 27a711b4cb0f58b08794d8d85284c8220404e6c7 (diff) | |
| download | mariadb-git-3a88de432160d0aa9bfb1cf6e8d3c4febd0eff71.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index ddf69044645..04fcabf293e 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -232,7 +232,7 @@ SLEEP_TIME_FOR_DELETE=10 SLEEP_TIME_FOR_FIRST_MASTER=400 # Enough time to create innodb tables SLEEP_TIME_FOR_SECOND_MASTER=400 SLEEP_TIME_FOR_FIRST_SLAVE=400 -SLEEP_TIME_FOR_SECOND_SLAVE=30 +SLEEP_TIME_FOR_SECOND_SLAVE=300 CHARACTER_SET=latin1 DBUSER="" START_WAIT_TIMEOUT=10 |