From 8b804c84d636ae5fd2ad4e79251817eedb10cd02 Mon Sep 17 00:00:00 2001
From: felix-w15 <806547150@qq.com>
Date: Fri, 13 Oct 2023 04:09:46 +0000
Subject: [PATCH] [CP] End stmt prioritize returning session error code

---
 src/sql/ob_sql_trans_control.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sql/ob_sql_trans_control.cpp b/src/sql/ob_sql_trans_control.cpp
index b44cc3b30..c3b27b1f2 100644
--- a/src/sql/ob_sql_trans_control.cpp
+++ b/src/sql/ob_sql_trans_control.cpp
@@ -1055,6 +1055,10 @@ int ObSqlTransControl::end_stmt(ObExecContext &exec_ctx, const bool rollback)
       auto &touched_ls = tx_result.get_touched_ls();
       OZ (txs->rollback_to_implicit_savepoint(*tx_desc, savepoint, stmt_expire_ts, &touched_ls),
           savepoint, stmt_expire_ts, touched_ls);
+      // prioritize returning session error code
+      if (session->is_terminate(ret)) {
+        LOG_INFO("trans has terminated when end stmt", K(ret), K(tx_id_before_rollback));
+      }
     }
     // this may happend cause tx may implicit aborted
     // (for example: first write sql of implicit started trans meet lock conflict)