summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authormsvensson@pilot.mysql.com <>2006-12-22 13:34:23 +0100
committermsvensson@pilot.mysql.com <>2006-12-22 13:34:23 +0100
commit70b2f28f555de600931483e885398631043367fe (patch)
tree6626b8b96f9648853c7395639c7c8c704ec4345b /mysql-test/include
parentc3b6f11091377595ee77f12cec4587bd0a8b803b (diff)
downloadmariadb-git-70b2f28f555de600931483e885398631043367fe.tar.gz
Wait for mysqld connected to NDB to come out of read only mode
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/have_multi_ndb.inc4
-rw-r--r--mysql-test/include/have_ndb.inc4
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc
index 218a6852c41..819518b2674 100644
--- a/mysql-test/include/have_multi_ndb.inc
+++ b/mysql-test/include/have_multi_ndb.inc
@@ -24,5 +24,9 @@ flush tables;
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;
diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc
index 8cbeab07a4f..77857106488 100644
--- a/mysql-test/include/have_ndb.inc
+++ b/mysql-test/include/have_ndb.inc
@@ -4,4 +4,8 @@ disable_query_log;
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
+
+