diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2018-12-01 23:45:58 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2018-12-01 23:45:58 +0100 |
| commit | 0fb92dddf96eccde87ec600b98aec53d3d37aa2c (patch) | |
| tree | 85e8a8d3e8772a879551a9c462aaf3300f3d0d7c /storage/connect/tabxml.h | |
| parent | 5d6daa6f1588760c8c535ed3ef19ad23da212a18 (diff) | |
| download | mariadb-git-0fb92dddf96eccde87ec600b98aec53d3d37aa2c.tar.gz | |
- Make PlugSubAlloc to be exportable
Suppress unused parameter from PlugSubSet
modified: storage/connect/global.h
modified: storage/connect/plugutil.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/user_connect.cc
- Fix a bug making column catalog XML tables fail
modified: storage/connect/tabxml.cpp
- Comment out wrong message
modified: storage/connect/ha_connect.cc
- Update error message when sorting an ODBC table fails
modified: storage/connect/tabodbc.cpp
- Add error message when gettting an address
from an OEM fails.
modified: storage/connect/reldef.cpp
- Make some modifications useful for OEM module writting
Export discovery functions for CSV, JDBC and XML
Remove unuseful include from tabjson.h
Move TDBXML::data_charset function from header file to source
modified: storage/connect/tabfmt.h
modified: storage/connect/tabjson.h
modified: storage/connect/tabxml.cpp
modified: storage/connect/tabxml.h
- Update test result
modified: storage/connect/mysql-test/connect/r/jdbc_oracle.result
Diffstat (limited to 'storage/connect/tabxml.h')
| -rw-r--r-- | storage/connect/tabxml.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/tabxml.h b/storage/connect/tabxml.h index f55b7d98de7..102767e965a 100644 --- a/storage/connect/tabxml.h +++ b/storage/connect/tabxml.h @@ -9,6 +9,8 @@ typedef class XMLDEF *PXMLDEF; typedef class TDBXML *PTDBXML; typedef class XMLCOL *PXMLCOL; +DllExport PQRYRES XMLColumns(PGLOBAL, char *, char *, PTOS, bool); + /* --------------------------- XML classes --------------------------- */ /***********************************************************************/ @@ -100,8 +102,7 @@ class DllExport TDBXML : public TDBASE { virtual int DeleteDB(PGLOBAL g, int irc); virtual void CloseDB(PGLOBAL g); virtual int CheckWrite(PGLOBAL g) {Checked = true; return 0;} - virtual const CHARSET_INFO *data_charset() - {return &my_charset_utf8_general_ci;} + virtual const CHARSET_INFO *data_charset(); protected: // Members |