diff options
| author | unknown <igor@rurik.mysql.com> | 2005-08-02 13:17:49 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-08-02 13:17:49 -0700 |
| commit | 4b59882561205af89cc8cf5f2d35759a66c64314 (patch) | |
| tree | 4cda43376b4f45ccc72819c9496a81250647ae51 /sql/item_sum.cc | |
| parent | 7c7843a2161705c30cb8af84cdc1d94b7b24555b (diff) | |
| parent | bcaff83722efd083d4ccba37fe7b35cb4464b0f8 (diff) | |
| download | mariadb-git-4b59882561205af89cc8cf5f2d35759a66c64314.tar.gz | |
Manual merge
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index e26b6a75b7c..b669a8c426d 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2632,7 +2632,11 @@ int group_concat_key_cmp_with_distinct(void* arg, byte* key1, the temporary table, not the original field */ Field *field= (*field_item)->get_tmp_table_field(); - if (field) + /* + If field_item is a const item then either get_tp_table_field returns 0 + or it is an item over a const table. + */ + if (field && !(*field_item)->const_item()) { int res; uint offset= field->offset() - table->s->null_bytes; @@ -2666,8 +2670,11 @@ int group_concat_key_cmp_with_order(void* arg, byte* key1, byte* key2) the temporary table, not the original field */ Field *field= item->get_tmp_table_field(); - /* If the item is a constant, there is no tmp table field */ - if (field) + /* + If item is a const item then either get_tp_table_field returns 0 + or it is an item over a const table. + */ + if (field && !item->const_item()) { int res; uint offset= field->offset() - table->s->null_bytes; @@ -3037,7 +3044,6 @@ bool Item_func_group_concat::setup(THD *thd) DBUG_RETURN(TRUE); count_field_types(tmp_table_param,all_fields,0); - tmp_table_param->need_const= 1; DBUG_ASSERT(table == 0); /* We have to create a temporary table to get descriptions of fields |