From 63ee8a5fd4cac03f5482b8558e1d44fdd0acc925 Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Thu, 16 Nov 2023 14:16:32 +0000
Subject: [PATCH] fix bugs in master

---
 src/observer/mysql/obmp_stmt_execute.cpp       | 6 +++---
 src/sql/plan_cache/ob_sql_parameterization.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/observer/mysql/obmp_stmt_execute.cpp b/src/observer/mysql/obmp_stmt_execute.cpp
index 61b899ff63..87fc9f8288 100644
--- a/src/observer/mysql/obmp_stmt_execute.cpp
+++ b/src/observer/mysql/obmp_stmt_execute.cpp
@@ -570,7 +570,7 @@ int ObMPStmtExecute::before_process()
     }
   }
   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) {
       force_disconnect();
       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);
 
   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;
@@ -1939,7 +1939,7 @@ int ObMPStmtExecute::process()
 
   if (OB_FAIL(ret) && is_conn_valid()) {
     if (need_response_error) {
-      send_error_packet(ret, NULL);
+      send_error_packet(ret, NULL, (void *)(ctx_.get_reroute_info()));
     }
     if (need_disconnect) {
       force_disconnect();
diff --git a/src/sql/plan_cache/ob_sql_parameterization.cpp b/src/sql/plan_cache/ob_sql_parameterization.cpp
index 4261ef7020..1bd925fbd8 100644
--- a/src/sql/plan_cache/ob_sql_parameterization.cpp
+++ b/src/sql/plan_cache/ob_sql_parameterization.cpp
@@ -2006,7 +2006,7 @@ int ObSqlParameterization::get_related_user_vars(const ParseNode *tree, common::
     // do nothing
   } else {
     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;
         LOG_WARN("invalid argument", K(ret), K(tree -> str_value_), K(tree -> str_len_));
       } else {