diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-03 10:32:01 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-03 10:32:01 +0200 |
| commit | 1de6440a2e441e7aeffe85ee9c72e1e001fcf38d (patch) | |
| tree | 12d3bcf508b354fd5095aa9ee36e682ac827d6aa /storage/connect/tabmul.h | |
| parent | 63b7d9d1586336a61d6de7fbdcdfbc72e6117f93 (diff) | |
| download | mariadb-git-1de6440a2e441e7aeffe85ee9c72e1e001fcf38d.tar.gz | |
Fix MDEV-12587 MariaDB CONNECT DIR Type
- Subfolder Option: SELECT Query Never Ends
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
Work on MDEV-12667 Crash when using JSON tables
modified: storage/connect/connect.cc
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/plgdbutl.cpp
Change Base offset for DIR tables on Linux
modified: storage/connect/reldef.cpp
Diffstat (limited to 'storage/connect/tabmul.h')
| -rw-r--r-- | storage/connect/tabmul.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/connect/tabmul.h b/storage/connect/tabmul.h index 3c0ab1a4aa5..f26d982d49b 100644 --- a/storage/connect/tabmul.h +++ b/storage/connect/tabmul.h @@ -119,7 +119,8 @@ class DllExport DIRDEF : public TABDEF { /* Directory listing table */ PSZ Fn; /* Path/Name of file search */ bool Incl; /* true to include sub-directories */ bool Huge; /* true if files can be larger than 2GB */ - }; // end of DIRDEF + bool Nodir; /* true to exclude directories */ +}; // end of DIRDEF /***********************************************************************/ /* This is the DIR Access Method class declaration for tables that */ @@ -175,7 +176,8 @@ public: char Direc[_MAX_DIR]; // Search path char Fname[_MAX_FNAME]; // File name char Ftype[_MAX_EXT]; // File extention - }; // end of class TDBDIR + bool Nodir; // Exclude directories from file list +}; // end of class TDBDIR /***********************************************************************/ /* This is the DIR Access Method class declaration for tables that */ |