From: Andrei Elkin Date: November 1 2010 6:00pm Subject: bzr commit into mysql-next-mr branch (andrei.elkin:3190) WL#2540 List-Archive: http://lists.mysql.com/commits/122478 Message-Id: <201011011800.oA1I0fvB022886@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1947153470==" --===============1947153470== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl2540/ based on revid:andrei.elkin@stripped 3190 Andrei Elkin 2010-11-01 wl#2540 testing with CRC32 in all tests of binlog and rpl suites per push in the feature tree. modified: mysql-test/collections/mysql-next-mr.push mysql-test/suite/rpl/t/rpl_row_ignorable_event.test mysql-test/suite/sys_vars/r/binlog_checksum_basic.result mysql-test/suite/sys_vars/t/binlog_checksum_basic.test === modified file 'mysql-test/collections/mysql-next-mr.push' --- a/mysql-test/collections/mysql-next-mr.push 2010-10-27 10:47:25 +0000 +++ b/mysql-test/collections/mysql-next-mr.push 2010-11-01 18:00:28 +0000 @@ -1,6 +1,6 @@ +perl suite/rpl/extension/checksum.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum --vardir=var-rpl_binlog_checksum --suite=rpl,binlog --percent=99 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-per-push.list perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-per-push.list perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog --skip-test-list=collections/disabled-per-push.list perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1 -perl suite/rpl/extension/checksum.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum --vardir=var-rpl_binlog_checksum --suite=rpl,binlog === modified file 'mysql-test/suite/rpl/t/rpl_row_ignorable_event.test' --- a/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test 2010-08-06 02:20:44 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_ignorable_event.test 2010-11-01 18:00:28 +0000 @@ -73,7 +73,7 @@ source include/show_binlog_events.inc; --echo # MYSQL_BINLOG output base on master-bin.000001 let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---replace_regex /TIMESTAMP=[0-9]*/TIMESTAMP=t/ /#[0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* server id [0-9]*/#server id #/ /exec_time=[0-9]*/exec_time=#/ /error_code=[0-9]*/error_code=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /Start: binlog v [0-9]*/Start: binlog v#/ /created [0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* at startup/created # #:#:# at startup/ +--replace_regex /TIMESTAMP=[0-9]*/TIMESTAMP=t/ /#[0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* server id [0-9]*/#server id #/ /exec_time=[0-9]*/exec_time=#/ /error_code=[0-9]*/error_code=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /Start: binlog v [0-9]*/Start: binlog v#/ /created [0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* at startup/created # #:#:# at startup/ /[ ]CRC32 0x[abcdef0-9]+// --exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/$master_binlog let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); === modified file 'mysql-test/suite/sys_vars/r/binlog_checksum_basic.result' --- a/mysql-test/suite/sys_vars/r/binlog_checksum_basic.result 2010-10-28 17:09:41 +0000 +++ b/mysql-test/suite/sys_vars/r/binlog_checksum_basic.result 2010-11-01 18:00:28 +0000 @@ -1,10 +1,10 @@ set @save_binlog_checksum= @@global.binlog_checksum; +set @@global.binlog_checksum = default; select @@global.binlog_checksum as 'must be NONE by default'; must be NONE by default NONE select @@session.binlog_checksum as 'no session var'; ERROR HY000: Variable 'binlog_checksum' is a GLOBAL variable -set @@global.binlog_checksum = default; set @@global.binlog_checksum = CRC32; set @@global.binlog_checksum = CRC32; set @@global.master_verify_checksum = 0; === modified file 'mysql-test/suite/sys_vars/t/binlog_checksum_basic.test' --- a/mysql-test/suite/sys_vars/t/binlog_checksum_basic.test 2010-10-28 17:09:41 +0000 +++ b/mysql-test/suite/sys_vars/t/binlog_checksum_basic.test 2010-11-01 18:00:28 +0000 @@ -4,12 +4,12 @@ # all checksum related system variables. set @save_binlog_checksum= @@global.binlog_checksum; +set @@global.binlog_checksum = default; select @@global.binlog_checksum as 'must be NONE by default'; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.binlog_checksum as 'no session var'; -set @@global.binlog_checksum = default; # testing lack of side-effects in non-effective update of binlog_checksum: set @@global.binlog_checksum = CRC32; --===============1947153470== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl2540/ # testament_sha1: e2a2af21db3724771c3981227408dd698da20d84 # timestamp: 2010-11-01 20:00:41 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\ # next-rm-wl2540-checksum/ # base_revision_id: andrei.elkin@stripped\ # ha8514hrvqoebfq9 # # Begin bundle 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 ENxOiGd9XM01RCBZ8rDL/4u5IpwoSFx8I2QA --===============1947153470==--