diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-11 21:39:41 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-02-11 21:39:41 +0100 |
| commit | dcfe068d5936259d49ac4d6d665122486d2ceda3 (patch) | |
| tree | f735ae80849a538cc7e9341d6faa5a5f258f1aa9 /storage/connect/tabutil.h | |
| parent | 3c097fd68919c220eb6492650e4f1d01612f5b33 (diff) | |
| download | mariadb-git-dcfe068d5936259d49ac4d6d665122486d2ceda3.tar.gz | |
- Adding json udf's. Making the second version of json tables.
added:
storage/connect/jsonudf.cpp
modified:
storage/connect/CMakeLists.txt
storage/connect/json.cpp
storage/connect/json.h
storage/connect/tabjson.cpp
storage/connect/tabjson.h
- Fix utf8 issues with PROXY tables
modified:
storage/connect/ha_connect.cc
storage/connect/tabutil.cpp
storage/connect/tabutil.h
Diffstat (limited to 'storage/connect/tabutil.h')
| -rw-r--r-- | storage/connect/tabutil.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/connect/tabutil.h b/storage/connect/tabutil.h index 06dd4d5128b..d9db8751a65 100644 --- a/storage/connect/tabutil.h +++ b/storage/connect/tabutil.h @@ -118,6 +118,8 @@ class DllExport PRXCOL : public COLBLK { virtual bool Init(PGLOBAL g, PTDBASE tp); protected: + char *PRXCOL::Decode(PGLOBAL g, const char *cnm); + // Default constructor not to be used PRXCOL(void) {} @@ -145,4 +147,8 @@ class TDBTBC : public TDBCAT { PSZ Tab; // Table name }; // end of class TDBMCL +class XCOLBLK : public COLBLK { + friend class PRXCOL; +}; // end of class XCOLBLK + #endif // TABUTIL |