Fix rollback of every transaction

1 files changed, 2 insertions, 6 deletions

diff --git a/ydb/core/kqp/session_actor/kqp_session_actor.cpp b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
index 7d8b73058d2..3b05f064d8a 100644
--- a/ydb/core/kqp/session_actor/kqp_session_actor.cpp
+++ b/ydb/core/kqp/session_actor/kqp_session_actor.cpp
@@ -1257,12 +1257,6 @@ public:
 
     void FillTxInfo(NKikimrKqp::TQueryResponse* response) {
         YQL_ENSURE(QueryState);
-        if (QueryState->Commit) {
-            if (auto ctx = Transactions.ReleaseTransaction(QueryState->TxId)) {
-                Transactions.AddToBeAborted(std::move(ctx));
-            }
-            QueryState->TxId = TTxId();
-        }
         response->MutableTxMeta()->set_id(QueryState->TxId.GetHumanStr());
 
         if (QueryState->TxCtx) {
@@ -1328,6 +1322,8 @@ public:
 
         if (QueryState->Commit) {
             ResetTxState();
+            Transactions.ReleaseTransaction(QueryState->TxId);
+            QueryState->TxId = TTxId();
         }
 
         FillTxInfo(response);