From: Frazer Clement Date: September 21 2011 12:04pm Subject: bzr push into mysql-5.5-cluster branch (frazer.clement:3507 to 3508) List-Archive: http://lists.mysql.com/commits/141053 Message-Id: <201109211204.p8LC4qwv018046@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3508 Frazer Clement 2011-09-21 Testcase fixes modified: mysql-test/extra/binlog_tests/binlog.test mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/sys_vars/r/all_vars.result 3507 Frazer Clement 2011-09-21 [merge] Merge to 5.5-cluster added: mysql-test/include/have_binlog_row_v2.inc mysql-test/r/have_binlog_row_v2.require modified: mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/include/show_binlog_events2.inc mysql-test/include/show_binlog_using_logname.inc mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/flush2.result mysql-test/r/mysqld--help-notwin.result mysql-test/suite/binlog/t/binlog_incident.test mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test mysql-test/suite/ndb_rpl/t/ndb_rpl_multi.test mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/t/rpl_extra_row_data.test mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test mysql-test/t/ctype_cp932_binlog_stm.test sql/ha_ndbcluster_binlog.cc sql/log_event.cc sql/log_event.h sql/log_event_old.h sql/mysqld.cc sql/mysqld.h sql/rpl_constants.h sql/rpl_injector.cc sql/rpl_injector.h sql/sql_class.cc sql/sql_class.h sql/sys_vars.cc === modified file 'mysql-test/extra/binlog_tests/binlog.test' --- a/mysql-test/extra/binlog_tests/binlog.test 2011-05-10 09:48:14 +0000 +++ b/mysql-test/extra/binlog_tests/binlog.test 2011-09-21 12:03:03 +0000 @@ -345,7 +345,7 @@ SHOW SESSION VARIABLES LIKE "%_checks"; --echo # INSERT INTO t1 VALUES(2) --echo # foreign_key_checks=1 and unique_checks=1 --echo # It should not change current session's variables, even error happens -call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062"); +call mtr.add_suppression("Slave SQL.*Could not execute Write_rows_v1 event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062"); --error 1062 BINLOG ' dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE= === modified file 'mysql-test/suite/binlog/r/binlog_row_binlog.result' --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result 2011-09-21 10:57:59 +0000 +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result 2011-09-21 12:03:03 +0000 @@ -1374,7 +1374,7 @@ unique_checks OFF # INSERT INTO t1 VALUES(2) # foreign_key_checks=1 and unique_checks=1 # It should not change current session's variables, even error happens -call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062"); +call mtr.add_suppression("Slave SQL.*Could not execute Write_rows_v1 event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062"); BINLOG ' dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE= dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA== === modified file 'mysql-test/suite/binlog/r/binlog_stm_binlog.result' --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2011-09-21 10:57:59 +0000 +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2011-09-21 12:03:03 +0000 @@ -459,12 +459,12 @@ master-bin.000001 # Query # # use `test` master-bin.000001 # Query # # use `test`; insert into t1 values( 115 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 114 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 113 ) -master-bin.000001 # Query # # use `test`; insert into t1 values( 112 ) +master-bin.000001 # Query # # use `test`; insert into t1 values( ) master-bin.000001 # Query # # use `test`; insert into t1 values( 111 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 110 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 109 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 108 ) -master-bin.000001 # Query # # use `test`; insert into t1 values( ) +master-bin.000001 # Query # # use `test`; insert into t1 values( 107 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 106 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 105 ) master-bin.000001 # Query # # use `test`; insert into t1 values( 104 ) @@ -864,7 +864,7 @@ unique_checks OFF # INSERT INTO t1 VALUES(2) # foreign_key_checks=1 and unique_checks=1 # It should not change current session's variables, even error happens -call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062"); +call mtr.add_suppression("Slave SQL.*Could not execute Write_rows_v1 event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062"); BINLOG ' dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE= dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA== === modified file 'mysql-test/suite/sys_vars/r/all_vars.result' --- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-05-31 09:12:32 +0000 +++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-09-21 12:03:03 +0000 @@ -12,10 +12,12 @@ select variable_name as `There should be left join t1 on variable_name=test_name where test_name is null; There should be *no* variables listed below: INNODB_ROLLBACK_SEGMENTS +LOG_BIN_USE_V1_ROW_EVENTS INNODB_STATS_METHOD INNODB_FILE_FORMAT_MAX INNODB_LARGE_PREFIX INNODB_ROLLBACK_SEGMENTS +LOG_BIN_USE_V1_ROW_EVENTS INNODB_STATS_METHOD INNODB_FILE_FORMAT_MAX INNODB_LARGE_PREFIX No bundle (reason: useless for push emails).