diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-06-28 09:05:12 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-06-28 12:37:04 +0400 |
| commit | 3e7e87ddccf71ba5328c257b7d642d6803fbca3a (patch) | |
| tree | 0ea22d4c533b84b2675c3d7c7555f5ad367222ac /storage/connect/libdoc.cpp | |
| parent | 323a87b591d3e9bcedb7dea09b69d9eeb1c42880 (diff) | |
| download | mariadb-git-3e7e87ddccf71ba5328c257b7d642d6803fbca3a.tar.gz | |
MDEV-19897 Rename source code variable names from utf8 to utf8mb3
Diffstat (limited to 'storage/connect/libdoc.cpp')
| -rw-r--r-- | storage/connect/libdoc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp index 9b30b315441..a0a18c84817 100644 --- a/storage/connect/libdoc.cpp +++ b/storage/connect/libdoc.cpp @@ -765,8 +765,8 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n) { const char *txt = (const char *)cnt; uint dummy_errors; - uint32 len= copy_and_convert(buf, n, &my_charset_utf8_general_ci, txt, - strlen(txt), &my_charset_utf8_general_ci, + uint32 len= copy_and_convert(buf, n, &my_charset_utf8mb3_general_ci, txt, + strlen(txt), &my_charset_utf8mb3_general_ci, &dummy_errors); buf[len]= '\0'; return 0; @@ -777,8 +777,8 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n) /******************************************************************/ xmlChar *LIBXMLDOC::Encode(PGLOBAL g, char *txt) { - const CHARSET_INFO *ics= &my_charset_utf8_general_ci; - const CHARSET_INFO *ocs= &my_charset_utf8_general_ci; + const CHARSET_INFO *ics= &my_charset_utf8mb3_general_ci; + const CHARSET_INFO *ocs= &my_charset_utf8mb3_general_ci; size_t i = strlen(txt); size_t o = i * ocs->mbmaxlen / ics->mbmaxlen + 1; char *buf; |