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

sql_select.cc:

Browse source 
Code cleanup after fix for bug#23417.
This commit is contained in:
evgen@moonbone.local 2007-01-22 23:04:14 +03:00
parent 4e0760067a
commit 884713fb08
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_select.cc
View file

@ -8766,8 +8766,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
if (type != Item::FIELD_ITEM &&
item->real_item()->type() == Item::FIELD_ITEM &&
(item->type() != Item::REF_ITEM ||
!((Item_ref *) item)->depended_from))
!((Item_ref *) item)->depended_from)
{
orig_item= item;
item= item->real_item();
@ -13423,7 +13422,7 @@ count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields,
Item::Type type=field->type();
Item::Type real_type= field->real_item()->type();
if (type == Item::FIELD_ITEM || (real_type == Item::FIELD_ITEM &&
(type != Item::REF_ITEM || !((Item_ref *) field)->depended_from)))
!((Item_ref *) field)->depended_from))
param->field_count++;
else if (real_type == Item::SUM_FUNC_ITEM)
{