bk commit into 5.1 tree (msvensson:1.2388)

[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-12-22 13:33:49+01:00, msvensson@stripped +2 -0
  Wait for mysqld connected to NDB to come out of read only mode

  mysql-test/include/have_multi_ndb.inc@stripped, 2006-12-22 13:33:43+01:00, msvensson@stripped +4 -0
    Wait for mysqld connected to NDB to come out of read only mode

  mysql-test/include/have_ndb.inc@stripped, 2006-12-22 13:33:43+01:00, msvensson@stripped +4 -0
    Wait for mysqld connected to NDB to come out of read only mode

# 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:	pilot.mysql.com
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.12/mysql-test/include/have_ndb.inc	2006-10-06 13:12:04 +02:00
+++ 1.13/mysql-test/include/have_ndb.inc	2006-12-22 13:33:43 +01:00
@@ -4,4 +4,8 @@
 select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
 enable_query_log;
 
+# Check that master mysqld has come out of redonly mode
+--source include/ndb_not_readonly.inc
+
+
 

--- 1.4/mysql-test/include/have_multi_ndb.inc	2006-10-06 13:12:04 +02:00
+++ 1.5/mysql-test/include/have_multi_ndb.inc	2006-12-22 13:33:43 +01:00
@@ -24,5 +24,9 @@
 select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
 enable_query_log;
 
+# Check should be here as well...
+# # Check that second master mysqld has come out of redonly mode
+# --source include/ndb_not_readonly.inc
+
 # Set the default connection to 'server1'
 connection server1;