database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixing my_charset_utf8_bin to my_charset_utf8_general_ci.

Browse Source 
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
This commit is contained in:
Alexander Barkov
2013-02-04 11:37:35 +04:00
parent e89cb7f27a
commit dc6e20bda4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/ha_connect.cc
View File

@@ -3141,7 +3141,7 @@ char *ha_connect::encode(PGLOBAL g, char *cnm)
char *buf= (char*)PlugSubAlloc(g, NULL, strlen(cnm) * 3); char *buf= (char*)PlugSubAlloc(g, NULL, strlen(cnm) * 3);
uint dummy_errors; uint dummy_errors;
uint32 len= copy_and_convert(buf, strlen(cnm) * 3, uint32 len= copy_and_convert(buf, strlen(cnm) * 3,
&my_charset_utf8_bin, &my_charset_utf8_general_ci,
cnm, strlen(cnm), cnm, strlen(cnm),
&my_charset_latin1, &my_charset_latin1,
&dummy_errors); &dummy_errors);

4
storage/connect/libdoc.cpp
View File

@@ -376,7 +376,7 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n)
const char *txt = (const char *)cnt; const char *txt = (const char *)cnt;
uint dummy_errors; uint dummy_errors;
uint32 len= copy_and_convert(buf, n, &my_charset_latin1, txt, 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); &dummy_errors);
buf[len]= '\0'; buf[len]= '\0';
return 0; return 0;
@@ -388,7 +388,7 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n)
xmlChar *LIBXMLDOC::Encode(PGLOBAL g, char *txt) xmlChar *LIBXMLDOC::Encode(PGLOBAL g, char *txt)
{ {
const CHARSET_INFO *ics= &my_charset_latin1; // TODO: Field->charset() 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 i = strlen(txt);
size_t o = i * ocs->mbmaxlen / ics->mbmaxlen + 1; size_t o = i * ocs->mbmaxlen / ics->mbmaxlen + 1;
char *buf; char *buf;