hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix mysqltest

Browse Source
This commit is contained in:
obdev
2023-02-15 14:44:56 +00:00
committed by ob-robot
parent 076558b3cc
commit 4c6eae115a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/ob_sql.cpp
View File

@ -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