diff options
| author | evgen@moonbone.local <> | 2007-01-22 23:04:14 +0300 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-01-22 23:04:14 +0300 |
| commit | 884713fb08418ae819ba39a5429a3dd18586c423 (patch) | |
| tree | f886202a76f0338be9bde0f3578af2579920ae26 | |
| parent | 4e0760067a0dc994f3d3d4e2c6c6bd3e72a62324 (diff) | |
| download | mariadb-git-884713fb08418ae819ba39a5429a3dd18586c423.tar.gz | |
sql_select.cc:
Code cleanup after fix for bug#23417.
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b03c4556279..7bced1719eb 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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) { |