Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

mysql-test/include/wait_for_slave_io_to_stop.inc

+###################################################
+#Author: Jeb
+#Date: 2007-06-11
+#Purpose: used for io errors on the slave. If Slave gets an io
+#         error, the io trhead should stop
+#Details:
+#      1) Fill in and setup variables
+#      2) loop through looking for
+#         sql threads to stop
+#      3) If loops too long die.
+####################################################
+connection slave;
+let $my_show= SHOW SLAVE STATUS;
+let $sql_running= Slave_IO_Running;
+let $row_number= 1;
+let $run= 1;
+let $counter= 300;
+
+while ($run)
+{
+  let $io_result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, $row_number);
+  if (`SELECT '$io_result' = 'No'`){
+    let $run= 0;
+  }
+  sleep 0.1;
+  if (!$counter){
+    --echo "Failed while waiting for slave IO thread to stop"
+    SHOW SLAVE STATUS;
+    exit;
+  }
+  dec $counter;
+}
+

mysql-test/include/wait_for_slave_sql_to_stop.inc

+###################################################
+#Author: Jeb
+#Date: 2007-06-11
+#Purpose: used for SQL errors on the slave. If Slave gets a sql
+#         error, the SQL trhead should stop
+#Details:
+#      1) Fill in and setup variables
+#      2) loop through looking for
+#         sql threads to stop
+#      3) If loops too long die.
+####################################################
+connection slave;
+let $row_number= 1;
+let $run= 1;
+let $counter= 300;
+
+while ($run)
+{
+  let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number);
+  if (`SELECT '$sql_result' = 'No'`){
+    let $run= 0;
+  }
+  sleep 0.1;
+  if (!$counter){
+   --echo "Failed while waiting for slave SQL thread to stop"
+   SHOW SLAVE STATUS;
+   exit;
+  }
+  dec $counter;
+}

mysql-test/include/wait_for_slave_to_start.inc

+###################################################
+#Author: Jeb
+#Date: 2007-06-11
+#Purpose: To wait a brief time for slave to start
+#Details:
+#      1) Fill in and setup variables
+#      2) loop through looking for both
+#         io and sql threads to start
+#      3) If loops too long die.
+####################################################
+connection slave;
+let $row_number= 1;
+let $run= 1;
+let $counter= 300;
+
+while ($run)
+{
+  let $io_result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, $row_number);
+  if (`SELECT '$io_result' = 'Yes'`){
+
+    let $sql_result= query_get_value("SHOW SLAVE STATUS",  Slave_SQL_Running, $row_number);
+    if (`SELECT '$sql_result' = 'Yes'`){
+      let $run= 0;
+    }
+  }
+  sleep 0.1;
+  if (!$counter){
+    --echo "Failed while waiting for slave to start"
+    SHOW SLAVE STATUS;
+    exit;
+  }
+  dec $counter;
+}
+
+

mysql-test/include/wait_for_slave_to_stop.inc

+###################################################
+#Author: Jeb
+#Date: 2007-06-11
+#Purpose: To replace the mysqltest.c executable 
+#         wait_for_slave_to_stop function and
+#         return this to the test language.
+#Details:
+#      1) Fill in and setup variables
+#      2) loop through looking for both
+#         io and sql threads to stop
+#      3) If loops too long die.
+####################################################
+connection slave;
+let $row_number= 1;
+let $run= 1;
+let $counter= 300;
+
+while ($run)
+{
+  let $io_result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, $row_number);
+  if (`SELECT '$io_result' = 'No'`){
+
+    let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number);
+    if (`SELECT '$sql_result' = 'No'`){
+      let $run= 0;
+    }
+  }
+  sleep 0.1;
+  if (!$counter){
+    --echo "Failed while waiting for slave to stop"
+    SHOW SLAVE STATUS;
+    exit;
+  }
+  dec $counter;
+}
+
+