bzr commit into mysql-5.1-bugteam branch (Serge.Kozlov:2748) Bug#39013

[Serge Kozlov]

#At file:///home/ksm/sun/repo/bug39013/mysql-5.1-bugteam/ based on revid:timothy.smith@stripped

 2748 Serge Kozlov	2009-01-19
      Bug#39013:
      Fix the order of operation if the primitive. 
      The should to wait a stop of slave and only then
      check SQL error.
modified:
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc

=== 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-10-27 21:26:58 +0000
+++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc	2009-01-19 14:21:43 +0000
@@ -10,16 +10,20 @@
 
 echo --source include/wait_for_slave_sql_error_and_skip.inc;
 connection slave;
-source include/wait_for_slave_sql_error.inc;
+# wait for SQL thread to stop after the error
+source include/wait_for_slave_sql_to_stop.inc;
+# check that slave has a SQL error 
+let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
+if (`SELECT "$error"=""`)
+{
+  echo Slave is stopped but without SQL error;
+  exit;
+}
 if ($show_sql_error)
 {
-  let $error= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
   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;