diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-09 18:02:47 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-09 18:02:47 +0200 |
| commit | 5d75457fc93d22493d3f9e45162963e1b54f935c (patch) | |
| tree | ff1f04bd8f08a6a3e7aa5cb86ef7c2aa94ee69fb /storage/connect/xtable.h | |
| parent | 98f3fd646654f97b2bc10a7a7d63d2a5fb2aaa6f (diff) | |
| download | mariadb-git-5d75457fc93d22493d3f9e45162963e1b54f935c.tar.gz | |
- Implement the SERVID special columns. This imply modifying the way
special columns are processed. This will be documented.
Also some code cleanup and some changes to prepare the indexing of
nullable columns (not achieve yet)
modified:
storage/connect/colblk.cpp
storage/connect/colblk.h
storage/connect/connect.cc
storage/connect/connect.h
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/macutil.cpp
storage/connect/mycat.cc
storage/connect/plgdbsem.h
storage/connect/reldef.cpp
storage/connect/reldef.h
storage/connect/table.cpp
storage/connect/tabmysql.cpp
storage/connect/tabmysql.h
storage/connect/tabodbc.h
storage/connect/tabtbl.cpp
storage/connect/tabutil.h
storage/connect/value.h
storage/connect/xindex.cpp
storage/connect/xindex.h
storage/connect/xtable.h
Diffstat (limited to 'storage/connect/xtable.h')
| -rw-r--r-- | storage/connect/xtable.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/connect/xtable.h b/storage/connect/xtable.h index 7ef2d26136c..98c7305acd4 100644 --- a/storage/connect/xtable.h +++ b/storage/connect/xtable.h @@ -113,6 +113,7 @@ class DllExport TDB: public TBX { // Table Descriptor Block. {fprintf(f, "%s AM(%d)\n", m, GetAmType());} virtual void Print(PGLOBAL g, FILE *f, uint n); virtual void Print(PGLOBAL g, char *ps, uint z); + virtual PSZ GetServer(void) = 0; // Database pure virtual routines virtual PCOL ColDB(PGLOBAL g, PSZ name, int num) = 0; @@ -192,13 +193,14 @@ class DllExport TDBASE : public TDB { virtual void ResetSize(void) {MaxSize = -1;} virtual void RestoreNrec(void) {} virtual int ResetTableOpt(PGLOBAL g, bool dox); + virtual PSZ GetServer(void) {return "Current";} // Database routines virtual PCOL ColDB(PGLOBAL g, PSZ name, int num); virtual PCOL MakeCol(PGLOBAL, PCOLDEF, PCOL, int) {assert(false); return NULL;} virtual PCOL InsertSpecialColumn(PGLOBAL g, PCOL colp); - virtual PCOL InsertSpcBlk(PGLOBAL g, PCOLUMN cp); + virtual PCOL InsertSpcBlk(PGLOBAL g, PCOLDEF cdp); virtual void MarkDB(PGLOBAL g, PTDB tdb2); protected: |