diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2019-11-21 16:27:50 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2019-11-21 16:27:50 +0100 |
| commit | 3ad054170cafc9dc90b18f4e857f3a10545fc06d (patch) | |
| tree | 067bf277718686c4468a6187633f881443dcfca6 /sql/sql_explain.h | |
| parent | 9c0e462ff28b93127406eeb2db4b763423fabbe3 (diff) | |
| parent | 6718d3bc3241f72e07504133371cf3813d2e6fe9 (diff) | |
| download | mariadb-git-3ad054170cafc9dc90b18f4e857f3a10545fc06d.tar.gz | |
These changed were made after pulling 10.2.30 from origin
---------------------------------------------------------
- Temporarily fix MDEV-13782 by commenting out LIKE_FUNC i, CondFilter
modified: storage/connect/ha_connect.cc
- Make Rest available for MariaDB binary distributed versions.
modified: storage/connect/CMakeLists.txt
- Remove unused declaration
modified: storage/connect/filter.h
Diffstat (limited to 'sql/sql_explain.h')
| -rw-r--r-- | sql/sql_explain.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_explain.h b/sql/sql_explain.h index 489a23f7cda..08af84b3562 100644 --- a/sql/sql_explain.h +++ b/sql/sql_explain.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* @@ -232,6 +232,7 @@ public: /* Expensive constant condition */ Item *exec_const_cond; Item *outer_ref_cond; + Item *pseudo_bits_cond; /* HAVING condition */ Item *having; |