diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-19 23:42:08 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-19 23:42:08 +0200 |
| commit | 670f482f470eefd6356fc164ca8eb4d53f2f34d5 (patch) | |
| tree | d285fac88fd1d9e191d282df83f458f8ea297742 /storage/connect/domdoc.cpp | |
| parent | 18fc51f5a48191e0424a160f35c29764236b2047 (diff) | |
| download | mariadb-git-670f482f470eefd6356fc164ca8eb4d53f2f34d5.tar.gz | |
- Fix a bug causing wrong charset used when inserting an attibute in
an XML table with DOMDOC.
modified:
storage/connect/domdoc.cpp
- Add the flag HA_MUST_USE_TABLE_CONDITION_PUSHDOWN.
modified:
storage/connect/ha_connect.cc
- Update version number
modified:
storage/connect/ha_connect.cc
storage/connect/mysql-test/connect/r/xml.result
Diffstat (limited to 'storage/connect/domdoc.cpp')
| -rw-r--r-- | storage/connect/domdoc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/domdoc.cpp b/storage/connect/domdoc.cpp index 95426be97bc..ebdaeba57b5 100644 --- a/storage/connect/domdoc.cpp +++ b/storage/connect/domdoc.cpp @@ -618,8 +618,8 @@ bool DOMATTR::SetText(PGLOBAL g, char *txtp, int len) Len = len; } // endif len - if (!MultiByteToWideChar(CP_ACP, 0, txtp, strlen(txtp) + 1, - Ws, Len + 1)) { + if (!MultiByteToWideChar(CP_UTF8, 0, txtp, strlen(txtp) + 1, + Ws, Len + 1)) { sprintf(g->Message, MSG(WS_CONV_ERR), txtp); return true; } // endif |