diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-08-21 10:07:26 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-08-21 10:07:26 +0200 |
| commit | b4210f364003fbea3ccd778b5f5f5dbfc2bfa2f8 (patch) | |
| tree | df1647a564cfe504d5ceae00e1bb09ba750bdf77 /sql/item.cc | |
| parent | 75dfd4acb995789ca5f86ccbd361fff9d2797e79 (diff) | |
| parent | bcc677bb7264db08b22284998706b44c377ed8ec (diff) | |
| download | mariadb-git-b4210f364003fbea3ccd778b5f5f5dbfc2bfa2f8.tar.gz | |
Merge branch '10.0' into 10.1
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 f1b57c64410..1242812d0ed 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -6813,7 +6813,7 @@ Item *Item_field::update_value_transformer(THD *thd, uchar *select_arg) 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; |