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

[master] return end-stmt failure when retry is canceled

Browse Source
This commit is contained in:
chinaxing
2023-07-07 04:12:12 +00:00
committed by ob-robot
parent 1a4cad5305
commit 60526a0007
6 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/ob_result_set.cpp
View File

@ -780,7 +780,7 @@ OB_INLINE int ObResultSet::do_close_plan(int errcode, ObExecContext &ctx)
return ret;
}
int ObResultSet::close()
int ObResultSet::close(int &client_ret)
{
int ret = OB_SUCCESS;
LinkExecCtxGuard link_guard(my_session_, get_exec_context());
@ -896,7 +896,7 @@ int ObResultSet::close()
// notify close fail to listener
int err = OB_SUCCESS != do_close_plan_ret ? do_close_plan_ret : ret;
if (OB_SUCCESS != err && err != errcode_ && close_fail_cb_.is_valid()) {
close_fail_cb_(err);
close_fail_cb_(err, client_ret);
}
//NG_TRACE_EXT(result_set_close, OB_ID(ret), ret, OB_ID(arg1), prev_ret,
//OB_ID(arg2), ins_ret, OB_ID(arg3), errcode_, OB_ID(async), async);