bk commit into 4.1 tree (kent:1.2141)

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2141 05/03/22 15:57:20 kent@stripped +1 -0
  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
    1.247 05/03/22 15:57:11 kent@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-4.1-perl/RESYNC

--- 1.246/mysql-test/mysql-test-run.sh	2005-03-16 14:32:40 +01:00
+++ 1.247/mysql-test/mysql-test-run.sh	2005-03-22 15:57:11 +01:00
@@ -232,7 +232,7 @@
 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