diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-24 19:26:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-24 20:36:03 +0300 |
| commit | db203d7471b87395f344db4f8302065c085ab975 (patch) | |
| tree | faeb80ed57e2d8e70b4636a36659de88290cb96d /sql/table.cc | |
| parent | 433050562965d83228bcab0d39c8ec64058fe8e3 (diff) | |
| parent | 44ed24352212ed23bbc13ef0badedf41e87c3aad (diff) | |
| download | mariadb-git-db203d7471b87395f344db4f8302065c085ab975.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 94b3bc9d526..53d88bc02aa 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -5348,7 +5348,8 @@ Item *Field_iterator_table::create_item(THD *thd) Item_field *item= new (thd->mem_root) Item_field(thd, &select->context, *ptr); if (item && thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY && - !thd->lex->in_sum_func && select->cur_pos_in_select_list != UNDEF_POS) + !thd->lex->in_sum_func && select->cur_pos_in_select_list != UNDEF_POS && + select->join) { select->join->non_agg_fields.push_back(item); item->marker= select->cur_pos_in_select_list; |