Commit f4e6fca1 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 

into  mysql.com:/home/my/mysql-4.0
parents 2e887f79 d853ecd6

sql/item.cc

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ bool Item_field::fix_fields(THD *thd,TABLE_LIST *tables) 
      if (thd->lex.select_lex.is_item_list_lookup)

      {

        Item **res= find_item_in_list(this, thd->lex.select_lex.item_list);

        if (res && *res && (*res)->type() == Item::FIELD_ITEM)

        if (res && (*res)->type() == Item::FIELD_ITEM)

        {

          set_field((*((Item_field**)res))->field);

          return 0;