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

fix bugs in master

Browse Source
This commit is contained in:
obdev
2023-11-16 14:16:32 +00:00
committed by ob-robot
parent 8a5f223af8
commit 63ee8a5fd4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/observer/mysql/obmp_stmt_execute.cpp
View File

@ -570,7 +570,7 @@ int ObMPStmtExecute::before_process()
} }
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
send_error_packet(ret, NULL); send_error_packet(ret, NULL, (void *)(ctx_.get_reroute_info()));
if (OB_ERR_PREPARE_STMT_CHECKSUM == ret) { if (OB_ERR_PREPARE_STMT_CHECKSUM == ret) {
force_disconnect(); force_disconnect();
LOG_WARN("prepare stmt checksum error, disconnect connection", K(ret)); LOG_WARN("prepare stmt checksum error, disconnect connection", K(ret));
@ -1784,7 +1784,7 @@ int ObMPStmtExecute::process_execute_stmt(const ObMultiStmtItem &multi_stmt_item
do_after_process(session, ctx_, async_resp_used); do_after_process(session, ctx_, async_resp_used);
if (OB_FAIL(ret) && need_response_error && is_conn_valid()) { if (OB_FAIL(ret) && need_response_error && is_conn_valid()) {
send_error_packet(ret, NULL); send_error_packet(ret, NULL, (void *)(ctx_.get_reroute_info()));
} }
return ret; return ret;
@ -1939,7 +1939,7 @@ int ObMPStmtExecute::process()
if (OB_FAIL(ret) && is_conn_valid()) { if (OB_FAIL(ret) && is_conn_valid()) {
if (need_response_error) { if (need_response_error) {
send_error_packet(ret, NULL); send_error_packet(ret, NULL, (void *)(ctx_.get_reroute_info()));
} }
if (need_disconnect) { if (need_disconnect) {
force_disconnect(); force_disconnect();

2
src/sql/plan_cache/ob_sql_parameterization.cpp
View File

@ -2006,7 +2006,7 @@ int ObSqlParameterization::get_related_user_vars(const ParseNode *tree, common::
// do nothing // do nothing
} else { } else {
if (T_USER_VARIABLE_IDENTIFIER == tree -> type_) { if (T_USER_VARIABLE_IDENTIFIER == tree -> type_) {
if (OB_ISNULL(tree -> str_value_) || tree -> str_len_ <= 0) { if (OB_ISNULL(tree -> str_value_) || tree -> str_len_ < 0) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret), K(tree -> str_value_), K(tree -> str_len_)); LOG_WARN("invalid argument", K(ret), K(tree -> str_value_), K(tree -> str_len_));
} else { } else {