From f5b71849196e8d95a8688d31180179597ffae3ec Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2009 16:27:21 +0800 Subject: [PATCH 1/3] Updated experimental test list for rpl.rpl_cross_version and rpl.rpl_get_master_version_and_clock. --- mysql-test/collections/default.experimental | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index a0fa2a30a69..9fc39a8d780 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -18,8 +18,8 @@ main.plugin_load @solaris # Bug#42144 ndb.* # joro : NDB tests marked as experimental as agreed with bochklin -rpl.rpl_cross_version* # Bug #43913 2009-10-26 joro rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm -rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31 +rpl.rpl_cross_version* # Bug#48340 2009-12-01 Daogang rpl_cross_version: Found warnings/errors in server log file! +rpl.rpl_get_master_version_and_clock* # Bug #49191 2009-12-01 Daogang rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed rpl.rpl_innodb_bug28430* @solaris # Bug#46029 rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2 rpl.rpl_trigger* # Bug#47810 2009-10-04 joro rpl.rpl_trigger.test fails with valgrind errors with the innodb plugin From 248a74eaa10738a0e71e1fe1b11d7c236fe0f521 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Tue, 1 Dec 2009 11:19:51 +0200 Subject: [PATCH 2/3] Revert of the push of bug #20837 due to failing regression tests. --- mysql-test/r/innodb_mysql.result | 31 ------------------------------- mysql-test/t/innodb_mysql.test | 26 -------------------------- sql/handler.cc | 10 ++-------- 3 files changed, 2 insertions(+), 65 deletions(-) diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 2d93cbb47b3..402ab3c1b16 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -2273,35 +2273,4 @@ END| DROP PROCEDURE p1; DROP VIEW v1; DROP TABLE t1,t2; -# -# Bug #20837 Apparent change of isolation -# level during transaction -# -SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; -CREATE TABLE t1 (s1 INT) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1),(2); -COMMIT; -SET @@autocommit = 0; -COMMIT; -SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -START TRANSACTION; -SELECT * FROM t1; -s1 -1 -2 -Should be READ UNCOMMITTED -SELECT @@tx_isolation; -@@tx_isolation -READ-UNCOMMITTED -INSERT INTO t1 VALUES (-1); -Should be READ UNCOMMITTED -SELECT @@tx_isolation; -@@tx_isolation -READ-UNCOMMITTED -COMMIT; -Should now be REPEATABLE READ -SELECT @@tx_isolation; -@@tx_isolation -REPEATABLE-READ -DROP TABLE t1; End of 5.1 tests diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index 0462536371e..a2a1113598d 100644 --- a/mysql-test/t/innodb_mysql.test +++ b/mysql-test/t/innodb_mysql.test @@ -536,30 +536,4 @@ DROP PROCEDURE p1; DROP VIEW v1; DROP TABLE t1,t2; - ---echo # ---echo # Bug #20837 Apparent change of isolation ---echo # level during transaction ---echo # - -SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; -CREATE TABLE t1 (s1 INT) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1),(2); -COMMIT; - -SET @@autocommit = 0; -COMMIT; -SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -START TRANSACTION; -SELECT * FROM t1; ---echo Should be READ UNCOMMITTED -SELECT @@tx_isolation; -INSERT INTO t1 VALUES (-1); ---echo Should be READ UNCOMMITTED -SELECT @@tx_isolation; -COMMIT; ---echo Should now be REPEATABLE READ -SELECT @@tx_isolation; -DROP TABLE t1; - --echo End of 5.1 tests diff --git a/sql/handler.cc b/sql/handler.cc index f6cdaca05bd..216228ed509 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1369,14 +1369,8 @@ int ha_autocommit_or_rollback(THD *thd, int error) if (thd->transaction_rollback_request && !thd->in_sub_stmt) (void) ha_rollback(thd); } - } - else if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) - { - /* - If we're in autocommit mode, reset tx_isolation - to the default value - */ - thd->variables.tx_isolation= thd->session_tx_isolation; + + thd->variables.tx_isolation=thd->session_tx_isolation; } #endif DBUG_RETURN(error); From f1eb8d937e26c660a76ba4e32f709f614edfb102 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Tue, 1 Dec 2009 11:21:15 +0200 Subject: [PATCH 3/3] Bug #45576: moving the test from experimental to disabled. --- mysql-test/collections/default.experimental | 1 - mysql-test/suite/rpl/t/disabled.def | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index a0fa2a30a69..0ee9fd81d1c 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -21,7 +21,6 @@ ndb.* # joro : NDB tests marked as experiment rpl.rpl_cross_version* # Bug #43913 2009-10-26 joro rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31 rpl.rpl_innodb_bug28430* @solaris # Bug#46029 -rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2 rpl.rpl_trigger* # Bug#47810 2009-10-04 joro rpl.rpl_trigger.test fails with valgrind errors with the innodb plugin rpl_ndb.* # joro : NDB tests marked as experimental as agreed with bochklin diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 8cae44a3607..d2cb1ce9518 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -10,3 +10,4 @@ # ############################################################################## +rpl_row_create_table : Bug#45576 2009-12-01 joro rpl_row_create_table fails on PB2