1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge

Browse Source
This commit is contained in:
igor@rurik.mysql.com 2005-08-02 13:17:49 -07:00
commit 7322441dc7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/item_sum.cc
View File

@ -2632,7 +2632,11 @@ int group_concat_key_cmp_with_distinct(void* arg, byte* key1,
the temporary table, not the original field the temporary table, not the original field
*/ */
Field *field= (*field_item)->get_tmp_table_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; int res;
uint offset= field->offset() - table->s->null_bytes; 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 the temporary table, not the original field
*/ */
Field *field= item->get_tmp_table_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; int res;
uint offset= field->offset() - table->s->null_bytes; uint offset= field->offset() - table->s->null_bytes;
@ -3037,7 +3044,6 @@ bool Item_func_group_concat::setup(THD *thd)
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
count_field_types(tmp_table_param,all_fields,0); count_field_types(tmp_table_param,all_fields,0);
tmp_table_param->need_const= 1;
DBUG_ASSERT(table == 0); DBUG_ASSERT(table == 0);
/* /*
We have to create a temporary table to get descriptions of fields We have to create a temporary table to get descriptions of fields