From 6ed2c82436e405518e48ffd245cf1b9509a3c2af Mon Sep 17 00:00:00 2001 From: Alfranio Correia Date: Wed, 11 Nov 2009 13:51:49 +0000 Subject: [PATCH] Post-fix for merge mysql-5.1-rep+2 --> mysql-5.1-rep+3 mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test: Re-enabled some parts of the test after BUG#46572 mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result: Re-enabled some parts of the test after BUG#46572 mysql-test/suite/rpl/r/rpl_mysql_upgrade.result: Suppressed warning messages due to unsafe statements. mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result: Re-enabled some parts of the test after BUG#46572 mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result: Re-enabled some parts of the test after BUG#46572 mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test: Re-enabled some parts of the test after BUG#46572 mysql-test/suite/rpl/t/rpl_mysql_upgrade.test: Suppressed warning messages due to unsafe statements. mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test: Re-enabled some parts of the test after BUG#46572 mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test: Re-enabled some parts of the test after BUG#46572 --- .../rpl_tests/rpl_implicit_commit_binlog.test | 22 +++++++------------ .../r/rpl_mixed_implicit_commit_binlog.result | 9 ++++++++ .../suite/rpl/r/rpl_mysql_upgrade.result | 1 + .../r/rpl_row_implicit_commit_binlog.result | 9 ++++++++ .../r/rpl_stm_implicit_commit_binlog.result | 9 ++++++++ .../t/rpl_mixed_implicit_commit_binlog.test | 3 +-- mysql-test/suite/rpl/t/rpl_mysql_upgrade.test | 2 ++ .../rpl/t/rpl_row_implicit_commit_binlog.test | 3 +-- .../rpl/t/rpl_stm_implicit_commit_binlog.test | 3 +-- 9 files changed, 41 insertions(+), 20 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test b/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test index 39190611983..1cf99c9e92e 100644 --- a/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test +++ b/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test @@ -19,8 +19,7 @@ --echo ######################################################################### --echo # CONFIGURATION --echo ######################################################################### -#Re-enable this after fixing BUG#46572 -#connection master; +connection master; CREATE TABLE tt_1 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb; CREATE TABLE tt_2 (ddl_case INT, PRIMARY KEY(ddl_case)) ENGINE = Innodb; @@ -353,23 +352,18 @@ SET AUTOCOMMIT= 1; --echo ################################################################################### --echo # CHECK CONSISTENCY --echo ################################################################################### -# Re-enable this after fixing BUG#46572 -# #--sync_slave_with_master -# -# #--let $diff_table_1= master:test.tt_1 -# #--let $diff_table_2= slave:test.tt_1 -# #--source include/diff_tables.inc -# +--sync_slave_with_master + +--let $diff_table_1= master:test.tt_1 +--let $diff_table_2= slave:test.tt_1 +--source include/diff_tables.inc --echo ################################################################################### --echo # CLEAN --echo ################################################################################### -#Re-enable this after fixing BUG#46572 -#connection master; +connection master; DROP TABLE tt_1; DROP TABLE tt_2; - -#Re-enable this after fixing BUG#46572 -#sync_slave_with_master; +sync_slave_with_master; diff --git a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result index 39d68c75ca0..2641df307b4 100644 --- a/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result +++ b/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result @@ -1,3 +1,9 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; ######################################################################### # CONFIGURATION ######################################################################### @@ -524,6 +530,9 @@ master-bin.000001 # Query # # DROP DATABASE IF EXISTS db ################################################################################### # CHECK CONSISTENCY ################################################################################### +Comparing tables master:test.tt_1 and slave:test.tt_1 ################################################################################### # CLEAN ################################################################################### +DROP TABLE tt_1; +DROP TABLE tt_2; diff --git a/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result b/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result index 09a9121d22c..f7bb14d1adb 100644 --- a/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result +++ b/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT"); DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`; CREATE DATABASE `#mysql50#mysqltest-1`; Master position is not changed diff --git a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result index bc53057e5a1..8704eb566a3 100644 --- a/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result +++ b/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result @@ -1,3 +1,9 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; ######################################################################### # CONFIGURATION ######################################################################### @@ -565,6 +571,9 @@ master-bin.000001 # Query # # DROP DATABASE IF EXISTS db ################################################################################### # CHECK CONSISTENCY ################################################################################### +Comparing tables master:test.tt_1 and slave:test.tt_1 ################################################################################### # CLEAN ################################################################################### +DROP TABLE tt_1; +DROP TABLE tt_2; diff --git a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result index 7365f4591e5..02e7a34ef2d 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result +++ b/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result @@ -1,3 +1,9 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; ######################################################################### # CONFIGURATION ######################################################################### @@ -523,6 +529,9 @@ master-bin.000001 # Query # # DROP DATABASE IF EXISTS db ################################################################################### # CHECK CONSISTENCY ################################################################################### +Comparing tables master:test.tt_1 and slave:test.tt_1 ################################################################################### # CLEAN ################################################################################### +DROP TABLE tt_1; +DROP TABLE tt_2; diff --git a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test index c12427ba350..7c406aa560f 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test @@ -2,8 +2,7 @@ # Check file extra/rpl_tests/rpl_implicit_commit_binlog.test ################################################################################ --source include/have_binlog_format_mixed.inc -#Re-enable this after fixing BUG#46572 -#--source include/master-slave.inc +--source include/master-slave.inc --source include/have_innodb.inc --source extra/rpl_tests/rpl_implicit_commit_binlog.test diff --git a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test index bf5c6d2b921..273d8f692a2 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test +++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test @@ -10,6 +10,8 @@ # Only run test if "mysql_upgrade" is found --source include/have_mysql_upgrade.inc +call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT"); + connection master; --disable_warnings DROP DATABASE IF EXISTS `#mysql50#mysqltest-1`; diff --git a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test index 25764f1acc9..f5ee09ffacf 100644 --- a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test @@ -2,8 +2,7 @@ # Check file extra/rpl_tests/rpl_implicit_commit_binlog.test ################################################################################ --source include/have_binlog_format_row.inc -#Re-enable this after fixing BUG#46572 -#--source include/master-slave.inc +--source include/master-slave.inc --source include/have_innodb.inc --source extra/rpl_tests/rpl_implicit_commit_binlog.test diff --git a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test index be1906f39d3..392a2defc42 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test @@ -2,8 +2,7 @@ # Check file extra/rpl_tests/rpl_implicit_commit_binlog.test ################################################################################ --source include/have_binlog_format_statement.inc -#Re-enable this after fixing BUG#46572 -#--source include/master-slave.inc +--source include/master-slave.inc --source include/have_innodb.inc --source extra/rpl_tests/rpl_implicit_commit_binlog.test