diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-27 14:55:29 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-27 14:55:29 +0200 |
| commit | 1f9561d2f25bf243352b3d6a31ad05063fa733eb (patch) | |
| tree | eb8b53852f9d700a9134a2a695bdda43eb17b12f /sql/table.cc | |
| parent | bfd312df8397cca9f2e371955027b73f4283e495 (diff) | |
| parent | efc29bc531483fe69759498c6a2bc1c855170a3e (diff) | |
| download | mariadb-git-1f9561d2f25bf243352b3d6a31ad05063fa733eb.tar.gz | |
merge 5.1 => 5.5
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index be71663e4c3..3c46431078b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -4409,6 +4409,7 @@ Item *Field_iterator_table::create_item(THD *thd) { select->non_agg_fields.push_back(item); item->marker= select->cur_pos_in_select_list; + select->set_non_agg_field_used(true); } return item; } |