diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-01-09 20:52:17 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-01-09 20:52:17 +0100 |
| commit | 0891ae2fbb77c96a7fbeeb2ce9973d22da596f2a (patch) | |
| tree | 6af9062522d15d6b0ae0e930f8c8a32e41a847af /storage/connect/mycat.h | |
| parent | 6883e5c4c40d1411dcc7c43bbb7cbb3f2d0ab251 (diff) | |
| download | mariadb-git-0891ae2fbb77c96a7fbeeb2ce9973d22da596f2a.tar.gz | |
- Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema
(was sometimes in XTAB Catalog)
modified: storage/connect/mycat.cc
modified: storage/connect/mycat.h
modified: storage/connect/reldef.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabtbl.cpp
modified: storage/connect/tabutil.cpp
Diffstat (limited to 'storage/connect/mycat.h')
| -rw-r--r-- | storage/connect/mycat.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/connect/mycat.h b/storage/connect/mycat.h index dfcbb2f6766..05163f08f1b 100644 --- a/storage/connect/mycat.h +++ b/storage/connect/mycat.h @@ -100,15 +100,17 @@ class MYCAT : public CATALOG { //void SetDataPath(PGLOBAL g, const char *path) // {SetPath(g, &DataPath, path);} bool StoreIndex(PGLOBAL, PTABDEF) {return false;} // Temporary - PRELDEF GetTableDesc(PGLOBAL g, LPCSTR name, - LPCSTR type, PRELDEF *prp = NULL); +// PRELDEF GetTableDesc(PGLOBAL g, LPCSTR name, + PRELDEF GetTableDesc(PGLOBAL g, PTABLE tablep, + LPCSTR type, PRELDEF *prp = NULL); PTDB GetTable(PGLOBAL g, PTABLE tablep, MODE mode = MODE_READ, LPCSTR type = NULL); void ClearDB(PGLOBAL g); protected: - PRELDEF MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am); -//void SetPath(PGLOBAL g, LPCSTR *datapath, const char *path); +// PRELDEF MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am); + PRELDEF MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am); + //void SetPath(PGLOBAL g, LPCSTR *datapath, const char *path); // Members ha_connect *Hc; // The Connect handler |