mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt

Browse source 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.1-opt
This commit is contained in:
gkodinov/kgeorge@magare.gmz 2007-10-14 11:30:28 +03:00
commit deb62b6c77
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/item_sum.cc
View file

@ -917,7 +917,7 @@ bool Item_sum_distinct::setup(THD *thd)
DBUG_ENTER("Item_sum_distinct::setup");
/* It's legal to call setup() more than once when in a subquery */
if (tree)
return FALSE;
DBUG_RETURN(FALSE);
/*
Virtual table and the tree are created anew on each re-execution of
@ -925,7 +925,7 @@ bool Item_sum_distinct::setup(THD *thd)
mem_root.
*/
if (field_list.push_back(&field_def))
return TRUE;
DBUG_RETURN(TRUE);
null_value= maybe_null= 1;
quick_group= 0;
@ -937,7 +937,7 @@ bool Item_sum_distinct::setup(THD *thd)
args[0]->unsigned_flag);
if (! (table= create_virtual_tmp_table(thd, field_list)))
return TRUE;
DBUG_RETURN(TRUE);
/* XXX: check that the case of CHAR(0) works OK */
tree_key_length= table->s->reclength - table->s->null_bytes;