From 4c6eae115aa430738f6acf655e6464ecd9c8f9bf Mon Sep 17 00:00:00 2001 From: obdev Date: Wed, 15 Feb 2023 14:44:56 +0000 Subject: [PATCH] fix mysqltest --- src/sql/ob_sql.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sql/ob_sql.cpp b/src/sql/ob_sql.cpp index db33def70f..9301ece645 100644 --- a/src/sql/ob_sql.cpp +++ b/src/sql/ob_sql.cpp @@ -1143,7 +1143,10 @@ int ObSql::set_timeout_for_pl(ObSQLSessionInfo &session_info, int64_t &abs_timeo { int ret = OB_SUCCESS; int64_t query_timeout; - if (OB_FAIL(session_info.get_query_timeout(query_timeout))) { + if (THIS_WORKER.is_timeout()) { + ret = OB_TIMEOUT; + LOG_WARN("already timeout", K(ret), K(abs_timeout_us), K(THIS_WORKER.get_timeout_ts())); + } else if (OB_FAIL(session_info.get_query_timeout(query_timeout))) { // do nothing } else { OX (abs_timeout_us = session_info.get_query_start_time() > 0