diff options
| author | igor@rurik.mysql.com <> | 2005-08-02 11:58:52 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2005-08-02 11:58:52 -0700 |
| commit | 8420d76f8d5ad60310e970db643b351930231baa (patch) | |
| tree | 174e074356395385368c4756c2a9e9c1dd41bb4e /sql/sql_select.cc | |
| parent | 1e2e10afac432c3f68e04d840cac366f4d389707 (diff) | |
| download | mariadb-git-8420d76f8d5ad60310e970db643b351930231baa.tar.gz | |
sql_select.cc, sql_class.h:
Reversed the changes to fix bug #12095 after review
done by SergeyG. Applied a fix suggested by him.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fc85f49093d..1bde62276b8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5201,8 +5201,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, param->using_indirect_summary_function=1; continue; } - if (item->const_item() && (int) hidden_field_count <= 0 && - !param->need_const) + if (item->const_item() && (int) hidden_field_count <= 0) continue; // We don't have to store this } if (type == Item::SUM_FUNC_ITEM && !group && !save_sum_fields) |