From: Alexander Nozdrin
Date: November 12 2010 11:38am
Subject: bzr push into mysql-next-mr branch (alexander.nozdrin:3381 to 3383)
List-Archive: http://lists.mysql.com/commits/123710
Message-Id: <201011121137.oACBVfTO029360@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3383 Alexander Nozdrin	2010-11-12
      Disable rpl_change_master.test due to Bug 58160.

    modified:
      mysql-test/suite/rpl/t/disabled.def
 3382 Alexander Nozdrin	2010-11-12
      Fix rpl_conditional_comments.test. It causes rpl_events to fail first time.

    modified:
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
 3381 Tor Didriksen	2010-11-11 [merge]
      Automerge next-mr-opt-team => next-mr-bugfixing

    modified:
      mysql-test/include/icp_tests.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/null_key_all.result
      mysql-test/r/null_key_icp.result
      mysql-test/r/order_by_all.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/select_all.result
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none_jcl6.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_jcl6.result
      mysql-test/r/subquery_sj_all_jcl7.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_jcl6.result
      mysql-test/r/subquery_sj_dupsweed_jcl7.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_jcl6.result
      mysql-test/r/subquery_sj_firstmatch_jcl7.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_jcl6.result
      mysql-test/r/subquery_sj_loosescan_jcl7.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_jcl6.result
      mysql-test/r/subquery_sj_mat_jcl7.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      mysql-test/t/innodb_icp.test
      mysql-test/t/innodb_icp_all.test
      mysql-test/t/innodb_mrr.test
      mysql-test/t/innodb_mrr_all.test
      mysql-test/t/innodb_mrr_icp.test
      sql/handler.h
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/sql_select.cc
      storage/myisam/ha_myisam.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_conditional_comments.result'
--- a/mysql-test/suite/rpl/r/rpl_conditional_comments.result	2010-11-10 11:26:45 +0000
+++ b/mysql-test/suite/rpl/r/rpl_conditional_comments.result	2010-11-12 10:13:37 +0000
@@ -73,3 +73,4 @@ show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` EVENT e1 ON SCHEDULE EVERY 10 DAY DO SELECT 'abc'
 DROP TABLE t1;
+DROP EVENT e1;

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2010-10-02 19:12:58 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2010-11-12 11:37:06 +0000
@@ -10,6 +10,7 @@
 #
 ##############################################################################
 
+rpl_change_master         : Bug#58160 2010-11-12 alik Incorrect behaviour of rpl_chage_master
 rpl_row_create_table      : Bug#51574 2010-02-27 andrei failed different way than earlier with bug#45576
 rpl_spec_variables        : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
 rpl_log_pos               : BUG#55675 2010-09-10 alfranio rpl.rpl_log_pos fails sporadically with error binlog truncated in the middle

=== modified file 'mysql-test/suite/rpl/t/rpl_conditional_comments.test'
--- a/mysql-test/suite/rpl/t/rpl_conditional_comments.test	2010-11-10 11:26:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_conditional_comments.test	2010-11-12 10:13:37 +0000
@@ -82,4 +82,5 @@ CREATE/*!*/EVENT e1 ON SCHEDULE EVERY 10
 source include/show_binlog_events.inc;
 
 DROP TABLE t1;
+DROP EVENT e1;
 source include/master-slave-end.inc;

No bundle (reason: useless for push emails).