bk commit into 5.1 tree (msvensson:1.2241)

[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-27 09:15:05+02:00, msvensson@neptunus.(none) +1 -0
  Increase time to sleep to allow mysqlds to exit from readonly mode

  mysql-test/t/ndb_autodiscover3.test@stripped, 2006-07-27 09:15:02+02:00,
msvensson@neptunus.(none) +3 -1
    Increase time to sleep and add explanation why

# 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.7/mysql-test/t/ndb_autodiscover3.test	2006-07-27 09:15:11 +02:00
+++ 1.8/mysql-test/t/ndb_autodiscover3.test	2006-07-27 09:15:11 +02:00
@@ -17,7 +17,9 @@ insert into t1 values (1);
 
 --exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
-sleep 1;
+# Wait for mysqld to reconnect and exit from readonly mode
+# Should preferrably be a "while (!"select ndb_readonly")" loop
+sleep 2;
 --error 1297
 insert into t1 values (2);
 --error 1296