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

4
src/rootserver/ob_ddl_service.cpp
View File

@ -30044,6 +30044,7 @@ int ObDDLService::update_oracle_tenant_sys_var(
* In Oracle mode, we are only compatible with binary mode, so collate can only end with _bin
*/
if (CS_TYPE_UTF8MB4_BIN == tenant_schema.get_collation_type()
|| CS_TYPE_LATIN1_BIN == tenant_schema.get_collation_type()
|| CS_TYPE_GBK_BIN == tenant_schema.get_collation_type()
|| CS_TYPE_UTF16_BIN == tenant_schema.get_collation_type()
|| CS_TYPE_GB18030_BIN == tenant_schema.get_collation_type()) {
@ -30059,6 +30060,9 @@ int ObDDLService::update_oracle_tenant_sys_var(
} else if (CHARSET_GB18030 ==
ObCharset::charset_type_by_coll(tenant_schema.get_collation_type())) {
OZ(databuff_printf(val_buf, OB_MAX_SYS_PARAM_VALUE_LENGTH, "%s", "ZHS32GB18030"));
} else if (CHARSET_LATIN1 ==
ObCharset::charset_type_by_coll(tenant_schema.get_collation_type())) {
OZ(databuff_printf(val_buf, OB_MAX_SYS_PARAM_VALUE_LENGTH, "%s", "WE8MSWIN1252"));
}
SET_TENANT_VARIABLE(SYS_VAR_NLS_CHARACTERSET, val_buf);
} else {