[FEAT MERGE] GIS

2022-12-23 12:08:27 +00:00
parent 38846e73d6
commit 40d215fc5a
519 changed files with 158600 additions and 8396 deletions
--- a/src/sql/engine/expr/ob_expr_func_ceil.cpp
+++ b/src/sql/engine/expr/ob_expr_func_ceil.cpp
@ -82,7 +82,8 @@ int ObExprCeilFloor::calc_result_type1(ObExprResType &type,
      if (OB_FAIL(ObExprResultTypeUtil::get_round_result_type(res_type, type1.get_type()))) {
        LOG_WARN("get round result type failed", K(ret), K(type1), K(res_type));
      } else if (ObMaxType == res_type) {
-        ret = OB_ERR_UNEXPECTED;
+        // 兼容mysql处理不合法类型的报错行为
+        ret = OB_ERR_INVALID_TYPE_FOR_OP;
        LOG_WARN("unexpected result type", K(ret), K(type1), K(res_type));
      } else {
        type.set_type(res_type);