bzr commit into mysql-5.1-bugteam branch (joro:3232) Bug#20837

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/fix-5.1-bugteam/ based on revid:satya.bn@stripped

 3232 Georgi Kodinov	2009-12-01
      Revert of the push of bug #20837 due to failing regression tests.

    modified:
      mysql-test/r/innodb_mysql.result
      mysql-test/t/innodb_mysql.test
      sql/handler.cc
=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2009-11-30 11:30:28 +0000
+++ b/mysql-test/r/innodb_mysql.result	2009-12-01 09:19:51 +0000
@@ -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

=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test	2009-11-30 11:30:28 +0000
+++ b/mysql-test/t/innodb_mysql.test	2009-12-01 09:19:51 +0000
@@ -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

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-11-30 11:30:28 +0000
+++ b/sql/handler.cc	2009-12-01 09:19:51 +0000
@@ -1369,14 +1369,8 @@ int ha_autocommit_or_rollback(THD *thd, 
       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);


Attachment: [text/bzr-bundle] bzr/[e-mail]