fixed bad 5.0->5.1 merge

0357510d · gkodinov/kgeorge@macbook.gmz · 09c0569b · 0357510d · 0357510d
Commit 0357510d authored Nov 10, 2006 by gkodinov/kgeorge@macbook.gmz
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

mysql-test/t/disabled.def mysql-test/t/disabled.def +0 -1

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

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -44,4 +44,3 @@ rpl_multi_engine         : BUG#22583 2006-09-23 lars
 #rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 ndb_binlog_discover      : bug#21806 2006-08-24
 ndb_autodiscover3        : bug#21806
-order_by                 : GKodinov - please fix bug #22457 in 5.1 also
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3741,8 +3741,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
        Item** res= find_item_in_list(this, thd->lex->current_select->item_list,
                                      &counter, REPORT_EXCEPT_NOT_FOUND,
                                      &not_used);
-        if (res != (Item **)not_found_item &&
-            (*res)->type() == Item::FIELD_ITEM)
+        if (res != (Item **)not_found_item)
        {
          if ((*res)->type() == Item::FIELD_ITEM)
          {