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

into mysql.com:/home/my/mysql-4.0

Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
0f9a3c1c · monty@mysql.com · c933505d · 144c873e · 0f9a3c1c
Commit 0f9a3c1c authored Oct 13, 2005 by monty@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/item.cc sql/item.cc +2 -2

No files found.
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -351,8 +351,8 @@ 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)
+        Item **res= find_item_in_list(this, thd->lex.select_lex.item_list);
+        if (res && (*res)->type() == Item::FIELD_ITEM)
        {
          set_field((*((Item_field**)res))->field);
          return 0;