diff options
| author | unknown <timour@mysql.com> | 2005-10-03 22:02:22 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-10-03 22:02:22 +0300 |
| commit | 5672f913c248bb5e09bb7d5d622410dfe074fdf7 (patch) | |
| tree | b00d3f9ec6d7680497c677594748cd528a256962 /sql/sql_base.cc | |
| parent | 0e62189b0930a282527a60e0f954c46f8b5ef44e (diff) | |
| parent | 20c77c32e3389b748483b295871ae88190c733f6 (diff) | |
| download | mariadb-git-5672f913c248bb5e09bb7d5d622410dfe074fdf7.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-13410
sql/item.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 84574bf01b9..61640b43ca4 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3353,9 +3353,9 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter, for (uint i= 0; (item=li++); i++) { - if (field_name && item->type() == Item::FIELD_ITEM) + if (field_name && item->real_item()->type() == Item::FIELD_ITEM) { - Item_field *item_field= (Item_field*) item; + Item_ident *item_field= (Item_ident*) item; /* In case of group_concat() with ORDER BY condition in the QUERY |