Fix locking bug

Summary: see title Squash with 8194409 Per Database Read-Only Test Plan: mtr Reviewers: tianx Reviewed By: tianx Subscribers: webscalesql-eng Differential Revision: https://reviews.facebook.net/D54741
facebook · Feb 25, 2016 · c971129 · c971129
1 parent 70d9a6d
commit c971129
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sql/handler.cc b/sql/handler.cc
@@ -1475,8 +1475,8 @@ int ha_commit_trans(THD *thd, bool all, bool async,
                                         thd->variables.lock_wait_timeout))
       {
         ha_rollback_trans(thd, all);
-        thd->enter_stage(&old_stage, NULL, __func__, __FILE__, __LINE__);
-        DBUG_RETURN(1);
+        error= 1;
+        goto end;
       }
       release_mdl= true;