[FEAT MERGE] Fix the error code loss and overwriting issues on the master branch

Co-authored-by: jingtaoye35 <1255153887@qq.com>
Co-authored-by: fkuner <784819644@qq.com>
Co-authored-by: lucky-sinx <2549261744@qq.com>
This commit is contained in:
hwx65
2024-06-17 13:46:15 +00:00
committed by ob-robot
parent 020eae1d2b
commit da5aece3e1
266 changed files with 661 additions and 347 deletions

View File

@ -214,6 +214,7 @@ int ObRemoteTaskExecutor::handle_tx_after_rpc(ObScanner *scanner,
}
if (has_transfer_err || OB_FAIL(ret)) {
if (exec_ctx.use_remote_sql()) {
// ignore ret
LOG_WARN("remote execute use sql fail with transfer_error, tx will rollback", K(ret));
session->get_trans_result().set_incomplete();
} else {