mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 16:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed bad 5.0->5.1 merge

Browse source
This commit is contained in:
unknown 2006-11-10 12:43:44 +02:00
commit bbc5d13891
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/t/disabled.def
View file

@ -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

3
sql/item.cc
View file

@ -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)
{