database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into rurik.mysql.com:/home/igor/mysql-5.0


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-07-01 06:42:39 -07:00
parent eb4cb6eba3 7dad490f36
commit 120a2da13e
5 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.cc
View File

@ -12157,7 +12157,7 @@ count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields,
param->quick_group=1;
while ((field=li++))
{
Item::Type type=field->type();
Item::Type type=field->real_item()->type();
if (type == Item::FIELD_ITEM)
param->field_count++;
else if (type == Item::SUM_FUNC_ITEM)
@ -12171,7 +12171,7 @@ count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields,
for (uint i=0 ; i < sum_item->arg_count ; i++)
{
if (sum_item->args[0]->type() == Item::FIELD_ITEM)
if (sum_item->args[0]->real_item()->type() == Item::FIELD_ITEM)
param->field_count++;
else
param->func_count++;
@ -12418,9 +12418,10 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
param->copy_funcs.empty();
for (i= 0; (pos= li++); i++)
{
if (pos->type() == Item::FIELD_ITEM)
if (pos->real_item()->type() == Item::FIELD_ITEM)
{
Item_field *item;
pos= pos->real_item();
if (!(item= new Item_field(thd, ((Item_field*) pos))))
goto err;
pos= item;