Revert of the push of bug #20837 due to failing regression tests.

1 files changed, 2 insertions, 8 deletions

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);