replace ts related to ddl with scn.

2022-11-28 02:21:13 +00:00
parent bbec6aff49
commit 8a4d14122f
539 changed files with 17685 additions and 173434 deletions
--- a/src/sql/engine/expr/ob_expr_convert.cpp
+++ b/src/sql/engine/expr/ob_expr_convert.cpp
@ -113,7 +113,7 @@ int ObExprConvertOracle::calc_result_typeN(ObExprResType &type,
                                           ObExprTypeCtx &type_ctx) const
 {
  int ret = OB_SUCCESS;
-  if (!(param_num >= 2 || param_num <= 3)) {
+  if (!(param_num >= 2 && param_num <= 3)) {
    ret = OB_INVALID_ARGUMENT;
    LOG_WARN("param num should be 2 or 3", K(ret));
  }
--- a/src/sql/engine/expr/ob_expr_nlssort.cpp
+++ b/src/sql/engine/expr/ob_expr_nlssort.cpp
@ -99,6 +99,7 @@ int ObExprNLSSort::convert_to_coll_code(ObEvalCtx &ctx,
                                                  conv_buf_len,
                                                  result_len,
                                                  false,
+                                                  false,
                                                  0xFFFD /*�*/))) {
      LOG_WARN("charset convert failed", K(ret));
    } else {