local merge: 5.1-bt bug branch --> 5.1-bt latest

mysql-test/extra/rpl_tests/rpl_reset_slave.test

@@ -58,7 +58,7 @@ echo *** errno must be zero: $last_io_errno ***;
 
 change master to master_user='impossible_user_name';
 start slave;
-source include/wait_for_slave_io_to_stop.inc;
+source include/wait_for_slave_io_error.inc;
 let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 --disable_query_log
 eval SELECT $last_io_errno > 0 as ONE;
@@ -79,7 +79,7 @@ let $last_io_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
 source include/stop_slave.inc;
 change master to master_user='impossible_user_name';
 start slave;
-source include/wait_for_slave_io_to_stop.inc;
+source include/wait_for_slave_io_error.inc;
 let $last_io_errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 --disable_query_log
 eval SELECT $last_io_errno > 0 as ONE;

mysql-test/include/wait_for_slave_io_error.inc

+# ==== Purpose ====
+#
+# Waits until the IO thread of the current connection has got an
+# error, or until a timeout is reached.
+#
+# ==== Usage ====
+#
+# source include/wait_for_slave_io_error.inc;
+#
+# Parameters to this macro are $slave_timeout and
+# $slave_keep_connection. See wait_for_slave_param.inc for
+# descriptions.
+
+let $old_slave_param_comparison= $slave_param_comparison;
+
+let $slave_param= Last_IO_Errno;
+let $slave_param_comparison= !=;
+let $slave_param_value= 0;
+let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread;
+source include/wait_for_slave_param.inc;
+let $slave_error_message= ;
+
+let $slave_param_comparison= $old_slave_param_comparison;