From dbf7c215ce4ee92becd2948960f02710f2d9ddb1 Mon Sep 17 00:00:00 2001 From: Alfranio Correia Date: Wed, 21 Apr 2010 14:28:00 +0100 Subject: BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside a transaction BUG#52616 Temp table prevents switch binlog format from STATEMENT to ROW Post-merge fixes. mysql-test/include/commit.inc: Changed the test case as drop temporary is now written to the binary log in row mode. mysql-test/r/commit_1innodb.result: Changed the test case as drop temporary is now written to the binary log in row mode. mysql-test/r/ctype_cp932_binlog_stm.result: Disabled warning messages because the test runs in both statement and mixed modes. mysql-test/t/ctype_cp932_binlog_stm.test: Disabled warning messages because the test runs in both statement and mixed modes. mysql-test/t/mysqlbinlog.test: Removed the --short-form due to BUG#18337 what was suppressing the select * from t5 /* must be (1),(1) */ in row format. --- mysql-test/include/commit.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/include/commit.inc') diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 59d4f6be524..c0d30b56ef7 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -640,9 +640,9 @@ call p_verify_status_increment(2, 0, 1, 0); --echo # 25. DDL: DROP TEMPORARY TABLE, does not start a transaction --echo # drop temporary table t2; -call p_verify_status_increment(1, 0, 0, 0); +call p_verify_status_increment(1, 0, 1, 0); commit; -call p_verify_status_increment(1, 0, 0, 0); +call p_verify_status_increment(1, 0, 1, 0); --echo # 26. Verify that SET AUTOCOMMIT issues an implicit commit --echo # -- cgit v1.2.1