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

Fix the branch compatibility problems.

Browse Source
This commit is contained in:
LINxiansheng
2021-09-22 13:27:56 +08:00
committed by wangzelin.wzl
parent 74b95849f3
commit eff6d19fcc
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/expr/ob_expr_eval_functions.cpp
View File

@ -715,8 +715,9 @@ static ObExpr::EvalFunc g_expr_eval_functions[] = {
ObExprIsIpv4Compat::calc_is_ipv4_compat, /* 455 */ ObExprIsIpv4Compat::calc_is_ipv4_compat, /* 455 */
ObExprInetAton::calc_inet_aton, /* 456 */ ObExprInetAton::calc_inet_aton, /* 456 */
ObExprInet6Ntoa::calc_inet6_ntoa, /* 457 */ ObExprInet6Ntoa::calc_inet6_ntoa, /* 457 */
ObExprConvertTZ::eval_convert_tz, /* 458 */ NULL, // ObExprWeightString::eval_weight_string, /* 458 */
ObExprCrc32::calc_crc32_expr, /* 459 */ ObExprConvertTZ::eval_convert_tz, /* 459 */
ObExprCrc32::calc_crc32_expr, /* 460 */
}; };
REG_SER_FUNC_ARRAY(OB_SFA_SQL_EXPR_EVAL, g_expr_eval_functions, ARRAYSIZEOF(g_expr_eval_functions)); REG_SER_FUNC_ARRAY(OB_SFA_SQL_EXPR_EVAL, g_expr_eval_functions, ARRAYSIZEOF(g_expr_eval_functions));

18
src/sql/parser/ob_item_type.h
View File

@ -426,16 +426,16 @@ typedef enum ObItemType {
T_FUN_SYS_QUARTER = 711, T_FUN_SYS_QUARTER = 711,
T_FUN_SYS_BIT_LENGTH = 712, T_FUN_SYS_BIT_LENGTH = 712,
T_FUN_SYS_PI = 713, T_FUN_SYS_PI = 713,
T_FUN_SYS_EXPORT_SET = 714, T_FUN_SYS_EXPORT_SET = 721,
T_FUN_SYS_INET6NTOA = 715, T_FUN_SYS_INET6NTOA = 722,
T_FUN_SYS_INET6ATON = 716, T_FUN_SYS_INET6ATON = 723,
T_FUN_SYS_IS_IPV4 = 717, T_FUN_SYS_IS_IPV4 = 724,
T_FUN_SYS_IS_IPV6 = 718, T_FUN_SYS_IS_IPV6 = 725,
T_FUN_SYS_IS_IPV4_MAPPED = 719, T_FUN_SYS_IS_IPV4_MAPPED = 726,
T_FUN_SYS_IS_IPV4_COMPAT = 720, T_FUN_SYS_IS_IPV4_COMPAT = 727,
T_FUN_SYS_INETATON = 721, T_FUN_SYS_INETATON = 728,
T_FUN_SYS_CRC32 = 722, T_FUN_SYS_CRC32 = 730,
///< @note add new mysql only function type before this line ///< @note add new mysql only function type before this line
T_MYSQL_ONLY_SYS_MAX_OP = 800, T_MYSQL_ONLY_SYS_MAX_OP = 800,