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

[FEAT MERGE]charset latin1

Browse Source
This commit is contained in:
akaError
2023-01-28 15:43:48 +08:00
committed by ob-robot
parent 2663894581
commit af2506b14c
42 changed files with 1215 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/resolver/ddl/ob_alter_table_resolver.cpp
View File

@ -3990,6 +3990,8 @@ int ObAlterTableResolver::resolve_convert_to_character(const ParseNode &node)
if (CHARSET_INVALID == charset_type) {
ret = OB_ERR_UNKNOWN_CHARSET;
LOG_USER_ERROR(OB_ERR_UNKNOWN_CHARSET, charset.length(), charset.ptr());
} else if (OB_FAIL(sql::ObSQLUtils::is_charset_data_version_valid(charset_type, session_info_->get_effective_tenant_id()))) {
LOG_WARN("failed to check charset data version valid", K(ret));
} else {
charset_type_ = charset_type;
}
@ -4004,6 +4006,9 @@ int ObAlterTableResolver::resolve_convert_to_character(const ParseNode &node)
if (CS_TYPE_INVALID == collation_type) {
ret = OB_ERR_UNKNOWN_COLLATION;
LOG_USER_ERROR(OB_ERR_UNKNOWN_COLLATION, collation.length(), collation.ptr());
} else if (OB_FAIL(sql::ObSQLUtils::is_charset_data_version_valid(common::ObCharset::charset_type_by_coll(collation_type),
session_info_->get_effective_tenant_id()))) {
LOG_WARN("failed to check charset data version valid", K(ret));
} else {
collation_type_ = collation_type;
}