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

cp bug fix to open source branch

Browse Source
This commit is contained in:
obdev
2021-07-20 17:06:14 +08:00
committed by wangzelin.wzl
parent 91bb0da2ae
commit f45d2cdbe2
37 changed files with 766 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/lib/charset/ob_charset.cpp vendored
View File

@ -1593,7 +1593,7 @@ int ObCharset::aggregate_collation(const ObCollationLevel collation_level1, cons
if (OB_UNLIKELY(CS_LEVEL_INVALID == collation_level1 || CS_LEVEL_INVALID == collation_level2 ||
CS_TYPE_INVALID == collation_type1 || CS_TYPE_INVALID == collation_type2)) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("invalid collation level or type",
LOG_WARN("invalid collation level or type",
K(ret),
K(collation_level1),
K(collation_type1),