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 | |
| 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')
| -rw-r--r-- | storage/connect/domdoc.cpp | 4 | ||||
| -rw-r--r-- | storage/connect/ha_connect.cc | 2 | ||||
| -rw-r--r-- | storage/connect/ha_connect.h | 3 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/r/xml.result | 2 |
4 files changed, 6 insertions, 5 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 diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 57770567cd6..bca4a6efc73 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -165,7 +165,7 @@ extern "C" char nmfile[]; extern "C" char pdebug[]; extern "C" { - char version[]= "Version 1.01.0007 July 26, 2013"; + char version[]= "Version 1.01.0008 August 18, 2013"; #if defined(XMSG) char msglang[]; // Default message language diff --git a/storage/connect/ha_connect.h b/storage/connect/ha_connect.h index 8fc88098794..35daf2e5c19 100644 --- a/storage/connect/ha_connect.h +++ b/storage/connect/ha_connect.h @@ -208,7 +208,8 @@ public: return (HA_NO_TRANSACTIONS | HA_REC_NOT_IN_SEQ | HA_HAS_RECORDS | HA_NO_AUTO_INCREMENT | HA_NO_PREFIX_CHAR_KEYS | HA_NO_COPY_ON_ALTER | HA_CAN_VIRTUAL_COLUMNS | - /*HA_NULL_IN_KEY |*/ HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE); + HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | + /*HA_NULL_IN_KEY |*/ HA_MUST_USE_TABLE_CONDITION_PUSHDOWN); } /** @brief diff --git a/storage/connect/mysql-test/connect/r/xml.result b/storage/connect/mysql-test/connect/r/xml.result index 19b5c936e6c..ea915234203 100644 --- a/storage/connect/mysql-test/connect/r/xml.result +++ b/storage/connect/mysql-test/connect/r/xml.result @@ -413,7 +413,7 @@ DROP TABLE t1; SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml'); SELECT CAST(@a AS CHAR CHARACTER SET latin1); CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?> -<!-- Created by CONNECT Version 1.01.0007 July 26, 2013 --> +<!-- Created by CONNECT Version 1.01.0008 August 18, 2013 --> <t1> <line> <node>ÀÁÂÃ</node> |