bzr push into mysql-5.1 branch (kent:2686 to 2687)

[kent]

 2687 kent@stripped	2008-09-11 [merge]
      Merge from mysql-5.1.28-rc-release
modified:
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc

 2686 Timothy Smith	2008-09-10 [merge]
      Auto-merge 5.0-build -> 5.1-build (no changes)

=== modified file 'mysql-test/include/wait_for_slave_sql_error_and_skip.inc'
--- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc	2008-08-26 12:11:56 +0000
+++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc	2008-08-28 13:16:06 +0000
@@ -17,6 +17,9 @@ if ($show_sql_error)
   echo Last_SQL_Error = $error;
 }
 
+# wait for SQL thread to stop after the error
+source include/wait_for_slave_sql_to_stop.inc;
+
 # skip the erroneous statement
 set global sql_slave_skip_counter=1;
 start slave;