Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

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
+
+