List:Commits« Previous MessageNext Message »
From:Luís Soares Date:March 8 2011 12:21pm
Subject:Re: bzr push into mysql-trunk branch (andrei.elkin:3732 to 3733)
Bug#58753
View as plain text  
Thanks Andrei!

On 03/08/2011 11:29 AM, Andrei Elkin wrote:
>   3733 Andrei Elkin	2011-03-08
>        Merging Bug #58753 fixes to mysql-trunk removed a suppression in
> rpl_checksum.
>        This patch restores it.
>       @ mysql-test/suite/rpl/r/rpl_checksum.result
>          results are updated.
>       @ mysql-test/suite/rpl/t/rpl_checksum.test
>          restoring earlier patch's suppression.
>
>      modified:
>        mysql-test/suite/rpl/r/rpl_checksum.result
>        mysql-test/suite/rpl/t/rpl_checksum.test
>   3732 Jon Olav Hauglid	2011-03-08 [merge]
>        Merge from mysql-5.5 to mysql-trunk
>        Text conflict in client/mysqlcheck.c
>        Text conflict in sql/share/errmsg-utf8.txt
>        Text conflict in sql/sql_lex.h
>
>      added:
>        mysql-test/std_data/bug47205.frm
>      modified:
>        client/mysqlcheck.c
>        mysql-test/r/mysqlcheck.result
>        mysql-test/t/mysqlcheck.test
>        sql/handler.cc
>        sql/handler.h
>        sql/share/errmsg-utf8.txt
>        sql/sql_admin.cc
>        sql/sql_lex.h
>        sql/sql_yacc.yy
>        storage/archive/ha_archive.h
>        storage/csv/ha_tina.h
>        storage/federated/ha_federated.h
>        storage/myisam/ha_myisam.cc
> === modified file 'mysql-test/suite/rpl/r/rpl_checksum.result'
> --- a/mysql-test/suite/rpl/r/rpl_checksum.result	2011-02-21 13:23:29 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2011-03-08 11:29:11 +0000
> @@ -4,6 +4,7 @@ call mtr.add_suppression('Slave can not
>   call mtr.add_suppression('Replication event checksum verification failed');
>   call mtr.add_suppression('Relay log write failure: could not queue event from
> master');
>   call mtr.add_suppression('Event crc check failed! Most likely there is event
> corruption');
> +call mtr.add_suppression('Master is configured to log replication events with
> checksum, but will not send such events to slaves that cannot process');
>   set @master_save_binlog_checksum= @@global.binlog_checksum;
>   set @save_master_verify_checksum =  @@global.master_verify_checksum;
>   select @@global.binlog_checksum as 'must be CRC32 because of the command line
> option';
>
> === modified file 'mysql-test/suite/rpl/t/rpl_checksum.test'
> --- a/mysql-test/suite/rpl/t/rpl_checksum.test	2011-02-21 13:23:29 +0000
> +++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2011-03-08 11:29:11 +0000
> @@ -10,6 +10,7 @@ call mtr.add_suppression('Replication ev
>   # due to C failure simulation
>   call mtr.add_suppression('Relay log write failure: could not queue event from
> master');
>   call mtr.add_suppression('Event crc check failed! Most likely there is event
> corruption');
> +call mtr.add_suppression('Master is configured to log replication events with
> checksum, but will not send such events to slaves that cannot process');
>
>   # A. read/write access to the global vars:
>   # binlog_checksum master_verify_checksum slave_sql_verify_checksum
>
>
>
>
>

Thread
bzr push into mysql-trunk branch (andrei.elkin:3732 to 3733) Bug#58753Andrei Elkin8 Mar
  • Re: bzr push into mysql-trunk branch (andrei.elkin:3732 to 3733)Bug#58753Luís Soares8 Mar