bzr push into mysql-5.1 branch (sven:2626 to 2627) Bug#37975

[Sven Sandberg]

 2627 Sven Sandberg	2008-07-14
      BUG#37975: wait_for_slave_* should increase the timeout
      Post-push fixes: forgot to commit an updated result file.
modified:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result

 2626 Sven Sandberg	2008-07-14
      BUG#37975: wait_for_slave_* should increase the timeout
      Post-push fixes: I forgot to include the new files
      start_slave.inc and stop_slave.inc in the previuos push.
added:
  mysql-test/include/start_slave.inc
  mysql-test/include/stop_slave.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2008-04-03 09:50:43 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2008-07-14 14:06:03 +0000
@@ -4,7 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-stop slave;
+include/stop_slave.inc
 reset master;
 reset slave;
 reset master;
@@ -117,11 +117,7 @@ Aberdeen
 Abernathy
 aberrant
 aberration
-start slave;
-
-let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
-
---source include/wait_slave_status.inc
+include/start_slave.inc
 select * from t1 order by 1 asc;
 word
 Aarhus
@@ -194,7 +190,8 @@ Abernathy
 aberrant
 aberration
 flush logs;
-stop slave;
+include/stop_slave.inc
+include/start_slave.inc
 create table t2 (n int)ENGINE=NDB;
 insert into t2 values (1);
 show binlog events from <binlog_start>;
@@ -230,7 +227,6 @@ show binary logs;
 Log_name	File_size
 master-bin.000001	1760
 master-bin.000002	623
-start slave;
 show binary logs;
 Log_name	File_size
 slave-bin.000001	1855