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
This commit is contained in:
unknown 2005-03-22 15:57:20 +01:00
commit 3a88de4321
2 changed files with 4 additions and 4 deletions

View file

@ -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