From: Date: August 28 2008 3:19pm
Subject: bzr push into mysql-5.1 branch (kgeorge:2676 to 2677) Bug#37051
List-Archive: http://lists.mysql.com/commits/52848
X-Bug: 37051
Message-Id: <200808281319.m7SDJuCg026177@magare.gmz>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2677 Georgi Kodinov	2008-08-28
      on behalf of jasonh : fix of a test problem re bug#37051: 
      Wait for slave to stop before set skip counter
modified:
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc

 2676 Georgi Kodinov	2008-08-28 [merge]
      merge 5.0-bugteam -> 5.1-bugteam
modified:
  mysql-test/r/group_min_max.result
  mysql-test/r/type_bit.result
  mysql-test/t/group_min_max.test
  mysql-test/t/type_bit.test
  sql/field.h
  sql/sql_select.cc

=== 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;