diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-02-18 19:21:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-02-18 19:21:52 +0400 |
| commit | f41aadfaedeb90f5f9f9fb8100de81642cb5a048 (patch) | |
| tree | e08bf6f3a71b21f5011fed7f63b9f18a92e15c00 /storage/connect/libdoc.cpp | |
| parent | 8e1c194904e028accd0b1fb9f3c4e70cf8077c4d (diff) | |
| download | mariadb-git-f41aadfaedeb90f5f9f9fb8100de81642cb5a048.tar.gz | |
Adding DATA_CHARSET table option.
Diffstat (limited to 'storage/connect/libdoc.cpp')
| -rw-r--r-- | storage/connect/libdoc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp index 5768dfa8177..d60cc49e94a 100644 --- a/storage/connect/libdoc.cpp +++ b/storage/connect/libdoc.cpp @@ -375,7 +375,7 @@ 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_latin1, txt, + uint32 len= copy_and_convert(buf, n, &my_charset_utf8_general_ci, txt, strlen(txt), &my_charset_utf8_general_ci, &dummy_errors); buf[len]= '\0'; @@ -387,7 +387,7 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n) /******************************************************************/ xmlChar *LIBXMLDOC::Encode(PGLOBAL g, char *txt) { - const CHARSET_INFO *ics= &my_charset_latin1; // TODO: Field->charset() + const CHARSET_INFO *ics= &my_charset_utf8_general_ci; const CHARSET_INFO *ocs= &my_charset_utf8_general_ci; size_t i = strlen(txt); size_t o = i * ocs->mbmaxlen / ics->mbmaxlen + 1; |