mysql-5.5.34 merge

(some patches reverted, test case added)

1 files changed, 14 insertions, 2 deletions

diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 5b947401f56..b8a7afbd6c5 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -900,8 +900,20 @@ send_result_message:
       }
     }
     /* Error path, a admin command failed. */
-    trans_commit_stmt(thd);
-    trans_commit_implicit(thd);
+    if (thd->transaction_rollback_request)
+    {
+      /*
+        Unlikely, but transaction rollback was requested by one of storage
+        engines (e.g. due to deadlock). Perform it.
+      */
+      if (trans_rollback_stmt(thd) || trans_rollback_implicit(thd))
+        goto err;
+    }
+    else
+    {
+      if (trans_commit_stmt(thd) || trans_commit_implicit(thd))
+        goto err;
+    }
     close_thread_tables(thd);
     thd->mdl_context.release_transactional_locks();