diff options
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | sql/item.cc | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 44eec94f2db..8c4a76c78a9 100644 --- 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 diff --git a/sql/item.cc b/sql/item.cc index 58c2cb94a19..ba289106f4f 100644 --- 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, ¬_used); - if (res != (Item **)not_found_item && - (*res)->type() == Item::FIELD_ITEM) + if (res != (Item **)not_found_item) { if ((*res)->type() == Item::FIELD_ITEM) { |