diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-03-02 17:58:18 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-03-02 17:58:18 +0100 |
| commit | 5972b56a6d43aceb89e5242b6c323743eba9c71e (patch) | |
| tree | 9cb05cd22e464d31e8d3d0d42f890b9d18f68c08 /storage/connect/plgxml.h | |
| parent | 8c8fe2f3a62191d0d3e835242c08c23906478099 (diff) | |
| download | mariadb-git-5972b56a6d43aceb89e5242b6c323743eba9c71e.tar.gz | |
- Fix conversion bug for MS-DOM XML tables. The node content was written
and read as if the table DATA_CHARSET was ANSI instead of UTF-8. Warning
are now provided when the read content of a node is truncated.
modified:
storage/connect/domdoc.cpp
storage/connect/domdoc.h
storage/connect/libdoc.cpp
storage/connect/libdoc.h
storage/connect/plgxml.h
storage/connect/tabxml.cpp
- Conditional compilation of pre_create depending on the MARIADB setting.
modified:
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
Diffstat (limited to 'storage/connect/plgxml.h')
| -rw-r--r-- | storage/connect/plgxml.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/plgxml.h b/storage/connect/plgxml.h index a1d25e6b581..8fc95eabef7 100644 --- a/storage/connect/plgxml.h +++ b/storage/connect/plgxml.h @@ -110,7 +110,7 @@ class XMLNODE : public BLOCK { virtual PXNODE GetChild(PGLOBAL) = 0; // Methods - virtual char *GetText(char *, int) = 0; + virtual RCODE GetContent(PGLOBAL, char *, int) = 0; virtual bool SetContent(PGLOBAL, char *, int) = 0; virtual PXNODE Clone(PGLOBAL, PXNODE) = 0; virtual PXLIST GetChildElements(PGLOBAL, char * = NULL, PXLIST = NULL) = 0; |