diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 15:20:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 15:20:34 +0300 |
| commit | 9258097fa3617b720b2b518060c0d09a00455051 (patch) | |
| tree | 0d9e98513620fdb440f1d0f78351ca794a0f731d /sql/item.cc | |
| parent | cdc8debcaad6ee18ff7a146ab3f365367fe8ec93 (diff) | |
| parent | dc7c080369472f6f33344299d2e3d01619edf885 (diff) | |
| download | mariadb-git-9258097fa3617b720b2b518060c0d09a00455051.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 58d2b7dbfc0..7d8baf81d3b 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7402,7 +7402,7 @@ Item_direct_view_ref::derived_grouping_field_transformer_for_where(THD *thd, void Item_field::print(String *str, enum_query_type query_type) { if (field && field->table->const_table && - !(query_type & QT_NO_DATA_EXPANSION)) + !(query_type & (QT_NO_DATA_EXPANSION | QT_VIEW_INTERNAL))) { print_value(str); return; |