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

[Sven Sandberg]

 2628 Sven Sandberg	2008-07-15
      BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild
      Post-push fix. The previous patch did 'reset master' at the wrong place.
modified:
  mysql-test/include/master-slave-reset.inc

 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

=== modified file 'mysql-test/include/master-slave-reset.inc'
--- a/mysql-test/include/master-slave-reset.inc	2008-07-09 12:34:00 +0000
+++ b/mysql-test/include/master-slave-reset.inc	2008-07-15 10:01:54 +0000
@@ -24,13 +24,13 @@ reset master;
 reset slave;
 --enable_query_log
 connection slave;
---disable_query_log
-reset master;
---enable_query_log
 reset slave;
 # Clean up old test tables
 --disable_warnings
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 --enable_warnings
+--disable_query_log
+reset master;
+--enable_query_log
 start slave;
 source include/wait_for_slave_to_start.inc;