bzr commit into mysql-5.1 branch (sven:2626) Bug#37975

[Sven Sandberg]

#At file:///home/sven/bzr/b37975-wait_for_slave/5.1-rpl/

 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

per-file messages:
  mysql-test/include/start_slave.inc
    Added file.
    Purpose: start slave synchronously, waiting for the two
    threads to start.
  mysql-test/include/stop_slave.inc
    Added file.
    Purpose: stop slave synchronously, waiting for the two
    threads to stop.
=== added file 'mysql-test/include/start_slave.inc'
--- a/mysql-test/include/start_slave.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/start_slave.inc	2008-07-14 09:41:23 +0000
@@ -0,0 +1,21 @@
+# ==== Purpose ====
+#
+# Issues START SLAVE on the current connection. Then waits until both
+# the IO and SQL threads have started, or until a timeout is reached.
+#
+# Please use this instead of 'START SLAVE', to reduce the risk of test
+# case bugs.
+#
+# ==== Usage ====
+#
+# source include/wait_for_slave_to_start.inc;
+#
+# Parameters to this macro are $slave_timeout and
+# $slave_keep_connection. See wait_for_slave_param.inc for
+# descriptions.
+
+--disable_query_log
+START SLAVE;
+--enable_query_log
+--echo include/start_slave.inc
+source include/wait_for_slave_to_start.inc;

=== added file 'mysql-test/include/stop_slave.inc'
--- a/mysql-test/include/stop_slave.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/stop_slave.inc	2008-07-14 09:41:23 +0000
@@ -0,0 +1,21 @@
+# ==== Purpose ====
+#
+# Issues STOP SLAVE on the current connection. Then waits until both
+# the IO and SQL threads have stopped, or until a timeout is reached.
+#
+# Please use this instead of 'STOP SLAVE', to reduce the risk of test
+# case bugs.
+#
+# ==== Usage ====
+#
+# source include/wait_for_slave_to_start.inc;
+#
+# Parameters to this macro are $slave_timeout and
+# $slave_keep_connection. See wait_for_slave_param.inc for
+# descriptions.
+
+--disable_query_log
+STOP SLAVE;
+--enable_query_log
+--echo include/stop_slave.inc
+source include/wait_for_slave_to_stop.inc;