From ee449745899ee0ba37885dfcfd666fc67be2a8d1 Mon Sep 17 00:00:00 2001 From: 0xacc Date: Wed, 10 Jul 2024 06:21:38 +0000 Subject: [PATCH] [to #57957506] fix mysqltest --- src/sql/resolver/dml/ob_dml_resolver.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/sql/resolver/dml/ob_dml_resolver.cpp b/src/sql/resolver/dml/ob_dml_resolver.cpp index 1c6dd75b0..dcde5255f 100755 --- a/src/sql/resolver/dml/ob_dml_resolver.cpp +++ b/src/sql/resolver/dml/ob_dml_resolver.cpp @@ -11175,9 +11175,8 @@ int ObDMLResolver::resolve_const_exprs(const ParseNode &expr_node, if (OB_ISNULL(tmp_node)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("tmp_node is unexpected", KP(tmp_node), K(ret)); - } else if (OB_FAIL(ObResolverUtils::resolve_const_expr(params_, - *tmp_node, const_expr, NULL))) { - LOG_WARN("fail to resolve_const_expr", K(ret)); + } else if (OB_FAIL(resolve_sql_expr(*tmp_node, const_expr))) { + LOG_WARN("fail to resolve_sql_expr", K(ret)); } else if (OB_UNLIKELY(!const_expr->is_const_expr()) || OB_UNLIKELY(const_expr->has_flag(ObExprInfoFlag::CNT_CUR_TIME))) { ret = OB_ERR_NON_CONST_EXPR_IS_NOT_ALLOWED_FOR_PIVOT_UNPIVOT_VALUES; @@ -11188,9 +11187,8 @@ int ObDMLResolver::resolve_const_exprs(const ParseNode &expr_node, } } } else { - if (OB_FAIL(ObResolverUtils::resolve_const_expr(params_, - expr_node, const_expr, NULL))) { - LOG_WARN("fail to resolve_const_expr", K(ret)); + if (OB_FAIL(resolve_sql_expr(expr_node, const_expr))) { + LOG_WARN("fail to resolve_sql_expr", K(ret)); } else if (OB_UNLIKELY(!const_expr->is_const_expr()) || OB_UNLIKELY(const_expr->has_flag(ObExprInfoFlag::CNT_CUR_TIME))) { ret = OB_ERR_NON_CONST_EXPR_IS_NOT_ALLOWED_FOR_PIVOT_UNPIVOT_VALUES;