1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d3832a7068e..d4045c804d7 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2150,6 +2150,11 @@ Locked_tables_list::unlock_locked_tables(THD *thd)
     request for metadata locks and TABLE_LIST elements.
   */
   reset();
+  if (thd->variables.option_bits & OPTION_AUTOCOMMIT)
+  {
+    thd->variables.option_bits&= ~(OPTION_NOT_AUTOCOMMIT);
+    thd->server_status|= SERVER_STATUS_AUTOCOMMIT;
+  }
 }