bk commit into 5.0 tree (msvensson:1.2584) BUG#32025

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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, 2008-02-21 13:23:58+01:00, msvensson@stripped +3 -0
  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/include/ndb_wait_connected.inc@stripped, 2008-02-21 13:23:56+01:00, msvensson@stripped +26 -0
    Wait until mysqld has reconnected to ndbd after ndbd has been restarted

  mysql-test/include/ndb_wait_connected.inc@stripped, 2008-02-21 13:23:56+01:00, msvensson@stripped +0 -0

  mysql-test/t/ndb_autodiscover.test@stripped, 2008-02-21 13:23:56+01:00, msvensson@stripped +1 -0
    Wait until mysqld has reconnected to ndbd after ndbd has been restarted

  mysql-test/t/ndb_autodiscover3.test@stripped, 2008-02-21 13:23:56+01:00, msvensson@stripped +9 -0
    Wait until mysqld has reconnected to ndbd after ndbd has been restarted

diff -Nrup a/mysql-test/include/ndb_wait_connected.inc b/mysql-test/include/ndb_wait_connected.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/include/ndb_wait_connected.inc	2008-02-21 13:23:56 +01:00
@@ -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
+
+
diff -Nrup a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test
--- a/mysql-test/t/ndb_autodiscover.test	2006-01-24 08:30:48 +01:00
+++ b/mysql-test/t/ndb_autodiscover.test	2008-02-21 13:23:56 +01:00
@@ -491,6 +491,7 @@ select * from t1;
 select * from t1;
 --exec $NDB_MGM --no-defaults -e "all start" > /dev/null
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
+--source include/ndb_wait_connected.inc
 use test;
 drop database test_only_ndb_tables;
 
diff -Nrup a/mysql-test/t/ndb_autodiscover3.test b/mysql-test/t/ndb_autodiscover3.test
--- a/mysql-test/t/ndb_autodiscover3.test	2007-04-05 09:12:28 +02:00
+++ b/mysql-test/t/ndb_autodiscover3.test	2008-02-21 13:23:56 +01:00
@@ -25,6 +25,13 @@ insert into t1 values (1);
 --exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 
+# Create separate connection and use that for detecting
+# when mysqld has reconnected to ndbd
+connect (ndb_wait_con,127.0.0.1,root,,test,$MASTER_MYPORT,);
+--source include/ndb_wait_connected.inc
+disconnect ndb_wait_con;
+connection server1;
+
 --error 1297
 insert into t1 values (2);
 --error 1296
@@ -44,6 +51,7 @@ select * from t2 order by a limit 3;
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 
 --connection server2
+--source include/ndb_wait_connected.inc
 create table t2 (a int key) engine=ndbcluster;
 insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 select * from t2 order by a limit 3;
@@ -58,6 +66,7 @@ select * from t2 order by a limit 3;
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 
 --connection server1
+--source include/ndb_wait_connected.inc
 show tables;
 create table t2 (a int key) engine=ndbcluster;
 insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);