diff options
author | Alexander Barkov <bar@mnogosearch.org> | 2013-02-04 11:37:35 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mnogosearch.org> | 2013-02-04 11:37:35 +0400 |
commit | dc6e20bda4c25638c46edf1fdb789a62acbd17ff (patch) | |
tree | 00b48d1a0ddb39487b713a96580fbde1332ad0f1 /storage/connect/libdoc.cpp | |
parent | e89cb7f27ab325b8a114fc5db3a525bfff8ad6b2 (diff) | |
download | mariadb-git-dc6e20bda4c25638c46edf1fdb789a62acbd17ff.tar.gz |
Fixing my_charset_utf8_bin to my_charset_utf8_general_ci.
The formed required strings.lib in Windows.
The latter is an exported symbol from mysqld and does not need strings.lib.
modified:
storage/connect/ha_connect.cc
storage/connect/libdoc.cpp
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 cef4fa7b01e..00c206dc862 100644 --- a/storage/connect/libdoc.cpp +++ b/storage/connect/libdoc.cpp @@ -376,7 +376,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,
- strlen(txt), &my_charset_utf8_bin,
+ strlen(txt), &my_charset_utf8_general_ci,
&dummy_errors);
buf[len]= '\0';
return 0;
@@ -388,7 +388,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 *ocs= &my_charset_utf8_bin;
+ const CHARSET_INFO *ocs= &my_charset_utf8_general_ci;
size_t i = strlen(txt);
size_t o = i * ocs->mbmaxlen / ics->mbmaxlen + 1;
char *buf;
|