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

[FEAT MERGE] 424 SQL compatibility patch 433

Browse Source 
Co-authored-by: wjhh2008 <wjh2006-1@163.com>
Co-authored-by: GongYusen <986957406@qq.com>
Co-authored-by: hy-guo <fqboyg@gmail.com>
This commit is contained in:
jingtaoye35
2024-08-23 03:32:01 +00:00
committed by ob-robot
parent cb61323917
commit e537a0c479
296 changed files with 21588 additions and 4122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/expr/ob_expr_statement_digest.cpp
View File

@ -126,7 +126,7 @@ int ObExprStatementDigest::calc_result_type1(ObExprResType &type,
type.set_collation_level(CS_LEVEL_COERCIBLE);
type.set_length(OB_MAX_SQL_ID_LENGTH);
type1.set_calc_type(ObVarcharType);
OZ (aggregate_charsets_for_string_result(tmp_type, &type1, 1, type_ctx.get_coll_type()));
OZ (aggregate_charsets_for_string_result(tmp_type, &type1, 1, type_ctx));
OX (type1.set_calc_collation_type(tmp_type.get_collation_type()));
OX (type1.set_calc_collation_level(tmp_type.get_collation_level()));
return ret;
@ -190,7 +190,7 @@ int ObExprStatementDigestText::calc_result_type1(ObExprResType &type,
int ret = OB_SUCCESS;
type.set_clob();
type1.set_calc_type(ObVarcharType);
OZ (aggregate_charsets_for_string_result(type, &type1, 1, type_ctx.get_coll_type()));
OZ (aggregate_charsets_for_string_result(type, &type1, 1, type_ctx));
OX (type1.set_calc_collation_type(type.get_collation_type()));
OX (type1.set_calc_collation_level(type.get_collation_level()));
type.set_length(OB_MAX_MYSQL_VARCHAR_LENGTH);