only reset tx active_scn to enable recgnize first stmt retry

2023-12-26 03:13:40 +00:00
parent 4aacc8a7e6
commit d7ae28defd
4 changed files with 23 additions and 24 deletions
--- a/src/sql/ob_sql_trans_control.cpp
+++ b/src/sql/ob_sql_trans_control.cpp
@ -1098,7 +1098,9 @@ int ObSqlTransControl::end_stmt(ObExecContext &exec_ctx, const bool rollback)
 #else
  if (OB_FAIL(ret) || rollback) { print_log = true; }
 #endif
-  if (print_log && OB_NOT_NULL(session)) {
+  if (print_log
+      && OB_NOT_NULL(session)
+      && OB_TRY_LOCK_ROW_CONFLICT != exec_ctx.get_errcode()) {
    LOG_INFO("end stmt", K(ret),
             "plain_select", is_plain_select,
             "stmt_type", stmt_type,