From: Andrei Elkin
Date: May 8 2012 7:53pm
Subject: bzr push into mysql-trunk branch (andrei.elkin:3801 to 3802)
List-Archive: http://lists.mysql.com/commits/143769
Message-Id: <201205081953.q48JrxtA029293@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3802 Andrei Elkin	2012-05-08
      rpl_stm_mts_crash_safe.test is done runnable with mixed format as well.
      The previous change to the test got ineffective on PB2 because it does 
      not run per push as it was supposed to.
     @ mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
        Making the test runnable with mixed format as well.

    modified:
      mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test
 3801 Nuno Carvalho	2012-05-08
      BUG#13810456: GTID: UNTIL_SQL_BEFORE_GTID DOES NOT WORK
      
      Fixed parser verification on START SLAVE UNTIL SQL_*_GTID and position
      conditions.
      Added reset method to struct_slave_connection to allways clean previous
      values before parsing a new START SLAVE statement.

    modified:
      mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
      mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
      sql/rpl_slave.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_yacc.yy
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test	2012-05-07 19:15:48 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test	2012-05-08 19:53:29 +0000
@@ -5,7 +5,7 @@
 #--source include/big_test.inc
 #
 --source include/master-slave.inc
---source include/have_binlog_format_statement.inc
+--source include/have_binlog_format_mixed_or_statement.inc
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/not_valgrind.inc

No bundle (reason: useless for push emails).