diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2019-11-24 22:58:55 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2019-11-24 22:58:55 +0100 |
| commit | fb91774e4e6451298af51e31356a8b8fb1b19487 (patch) | |
| tree | 08858b138184ad2565acfe745d1151996c229e99 /storage/connect/connect.h | |
| parent | b4bfa12b0044f7e4659e919784a6ed2252ca21b8 (diff) | |
| download | mariadb-git-fb91774e4e6451298af51e31356a8b8fb1b19487.tar.gz | |
These changed were made after pulling 10.2.30 from origin
---------------------------------------------------------
- Temporarily fix MDEV-13782 by commenting out LIKE_FUNC in CondFilter
modified: storage/connect/ha_connect.cc
- Remove use of hack tables
modified: storage/connect/connect.cc
modified: storage/connect/connect.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/xtable.h
Diffstat (limited to 'storage/connect/connect.h')
| -rw-r--r-- | storage/connect/connect.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/connect/connect.h b/storage/connect/connect.h index 3a60cd40160..d1fc2ea592f 100644 --- a/storage/connect/connect.h +++ b/storage/connect/connect.h @@ -46,6 +46,7 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len, bool *incl, key_part_map *kmap); PGLOBAL CntExit(PGLOBAL g); +#if 0 /***********************************************************************/ /* Definition of classes XKPDEF, DOXDEF, TDBDOX */ /* These classes purpose is chiefly to access protected items! */ @@ -76,3 +77,4 @@ class XKPDEF: public KPARTDEF { public: XKPDEF(const char *name, int n) : KPARTDEF((PSZ)name, n) {} }; // end of class XKPDEF +#endif // 0 |