[CP] Fix wrong merge type between set and char

Co-authored-by: Larry955 <1412857955@qq.com>
This commit is contained in:
hezuojiao
2023-12-26 10:13:15 +00:00
committed by ob-robot
parent dd3a7f44f9
commit d52d2c12e6
2 changed files with 18 additions and 3 deletions

View File

@ -1299,7 +1299,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = {
ObLongTextType, /* CharType=>ObLongTextType */
ObVarcharType, /* CharType=>ObBitType */
ObVarcharType, /* CharType=>ObEnumType */
ObCharType, /* CharType=>ObSetType */
ObVarcharType, /* CharType=>ObSetType */
ObMaxType, /* CharType=>ObEnumInnerType */
ObMaxType, /* CharType=>ObSetInnerType */
ObCharType, /*CharType=>ObTimestampTZType */
@ -1834,7 +1834,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = {
ObVarcharType, /*ObSetType=>TimeType */
ObVarcharType, /*ObSetType=>YearType */
ObVarcharType, /*ObSetType=>VarcharType */
ObCharType, /*ObSetType=>CharType */
ObVarcharType, /*ObSetType=>CharType */
ObVarcharType, /*ObSetType=>HexStringType */
ObMaxType, /*ObSetType=>ExtendType */
ObVarcharType, /*ObSetType=>UnknownType */