summaryrefslogtreecommitdiff
path: root/mysql-test/include/ndb_wait_connected.inc
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2008-02-21 13:23:58 +0100
committerunknown <msvensson@pilot.mysql.com>2008-02-21 13:23:58 +0100
commitfa7707addfc0bca017992b804e0c77715356e263 (patch)
treec30c3e28cba5d7aeee88dbf546739f313456d483 /mysql-test/include/ndb_wait_connected.inc
parent4a80d5687734238fde09e74b8d66dd335f981815 (diff)
downloadmariadb-git-fa7707addfc0bca017992b804e0c77715356e263.tar.gz
Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd
- fix test failures that was already there but now are more consistent when the 1 second sleep has been removed from ndb_waiter mysql-test/t/ndb_autodiscover.test: Wait until mysqld has reconnected to ndbd after ndbd has been restarted mysql-test/t/ndb_autodiscover3.test: Wait until mysqld has reconnected to ndbd after ndbd has been restarted mysql-test/include/ndb_wait_connected.inc: Wait until mysqld has reconnected to ndbd after ndbd has been restarted
Diffstat (limited to 'mysql-test/include/ndb_wait_connected.inc')
-rw-r--r--mysql-test/include/ndb_wait_connected.inc26
1 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/include/ndb_wait_connected.inc b/mysql-test/include/ndb_wait_connected.inc
new file mode 100644
index 00000000000..cfea94db1f1
--- /dev/null
+++ b/mysql-test/include/ndb_wait_connected.inc
@@ -0,0 +1,26 @@
+# Check that mysqld has reconnected to ndbd after
+# restart of ndbd
+#
+--disable_query_log
+--disable_result_log
+let $mysql_errno= 1;
+let $counter= 600;
+while ($mysql_errno)
+{
+ --error 0,157
+ CREATE TABLE ndb_wait_connected (a int primary key);
+ if ($mysql_errno)
+ {
+ if (!$counter)
+ {
+ die Failed waiting for mysqld to reconnect to ndbd;
+ }
+ dec $counter;
+ --sleep 0.1
+ }
+}
+DROP TABLE ndb_wait_connected;
+--enable_query_log
+--enable_result_log
+
+