bk commit into 5.1 tree (msvensson:1.2224)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2006-07-20 10:59:55+02:00, msvensson@neptunus.(none) +1 -0
  Add small sleep after cluster restart to allow mysqld's to exit from readonly state

  mysql-test/t/ndb_autodiscover3.test@stripped, 2006-07-20 10:59:52+02:00,
msvensson@neptunus.(none) +2 -2
    Add small sleep after cluster restart to allow mysqld's to exit from readonly state

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.6/mysql-test/t/ndb_autodiscover3.test	2006-07-20 11:00:02 +02:00
+++ 1.7/mysql-test/t/ndb_autodiscover3.test	2006-07-20 11:00:02 +02:00
@@ -37,7 +37,7 @@
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
 --exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster apply_status >>
$NDB_TOOLS_OUTPUT
-
+sleep 2;
 --connection server2
 --error ER_NO_SUCH_TABLE
 select * from t2;
@@ -56,7 +56,7 @@
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
 --exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster apply_status >>
$NDB_TOOLS_OUTPUT
-
+sleep 2;
 --connection server1
 --error ER_NO_SUCH_TABLE
 select * from t2;