1 files changed, 2 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index fef6fccfd06..b8459c33bc2 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -3086,12 +3086,14 @@ static bool set_option_autocommit(THD *thd, set_var *var)
       thd->options&= ~(ulonglong) (OPTION_BEGIN |
                                    OPTION_STATUS_NO_TRANS_UPDATE |
                                    OPTION_KEEP_LOG);
+      thd->no_trans_update.all= FALSE;
       thd->server_status|= SERVER_STATUS_AUTOCOMMIT;
       if (ha_commit(thd))
 	return 1;
     }
     else
     {
+      thd->no_trans_update.all= FALSE;
       thd->options&= ~(ulonglong) (OPTION_STATUS_NO_TRANS_UPDATE);
       thd->server_status&= ~SERVER_STATUS_AUTOCOMMIT;
     }