List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:March 18 2011 1:15pm
Subject:bzr push into mysql-trunk branch (alfranio.correia:3300 to 3301) Bug#11877568
View as plain text  
 3301 Alfranio Correia	2011-03-18
      Post-merge fix for BUG#11877568.

    modified:
      mysql-test/suite/rpl/r/rpl_checksum_cache.result
      mysql-test/suite/rpl/t/rpl_checksum_cache.test
 3300 Tor Didriksen	2011-03-18 [merge]
      local merge

    modified:
      mysql-test/include/have_plugin_auth.inc
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
      mysql-test/t/mysql_client_test-master.opt
      mysql-test/t/mysql_client_test.test
      sql/ha_partition.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_checksum_cache.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum_cache.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum_cache.result	2011-03-18 13:11:47 +0000
@@ -2,7 +2,7 @@ include/master-slave.inc
 [connection master]
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement: insert into t2 set data=repeat.*'a', @act_size.*");
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement: insert into t1 values.* NAME_CONST.*'n',.*, @data .*");
-call mtr.add_suppression("Slave SQL: slave SQL thread is being stopped in the middle of applying of a group having updated a non-transaction table; waiting for the group completion");
+call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 set @save_binlog_cache_size = @@global.binlog_cache_size;
 set @save_binlog_checksum = @@global.binlog_checksum;
 set @save_master_verify_checksum = @@global.master_verify_checksum;

=== modified file 'mysql-test/suite/rpl/t/rpl_checksum_cache.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum_cache.test	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum_cache.test	2011-03-18 13:11:47 +0000
@@ -4,7 +4,7 @@
 --disable_warnings
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement: insert into t2 set data=repeat.*'a', @act_size.*");
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. Statement: insert into t1 values.* NAME_CONST.*'n',.*, @data .*");
-call mtr.add_suppression("Slave SQL: slave SQL thread is being stopped in the middle of applying of a group having updated a non-transaction table; waiting for the group completion");
+call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 --enable_warnings
 
 connection master;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (alfranio.correia:3300 to 3301) Bug#11877568Alfranio Correia18 Mar