Fix crash in BDB from improper cleanup of transactions, and avoid problem

in NDB that the fix would cause due to improper registration of a transaction
that isn't meant to be seen by the handler layer. (Bug #14212)

Thanks to Sergei Golubchik for helping with this.

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 81e94af5dc7..416455c9bb9 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1910,7 +1910,8 @@ int ha_enable_transaction(THD *thd, bool on)
       is an optimization hint that storage engine is free to ignore.
       So, let's commit an open transaction (if any) now.
     */
-    error= end_trans(thd, COMMIT);
+    if (!(error= ha_commit_stmt(thd)))
+      error= end_trans(thd, COMMIT);
   }
   DBUG_RETURN(error);
 }