Skip to content

M
mariadb
Commit bbc5d138 authored by unknown's avatar unknown
Browse files
Options

fixed bad 5.0->5.1 merge

parent 463e9409
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
mysql-test/t/disabled.def
View file @ bbc5d138
...@@ -44,4 +44,3 @@ rpl_multi_engine : BUG#22583 2006-09-23 lars ...@@ -44,4 +44,3 @@ rpl_multi_engine : BUG#22583 2006-09-23 lars
#rpl_truncate_7ndb : BUG#21298 2006-07-27 msvensson #rpl_truncate_7ndb : BUG#21298 2006-07-27 msvensson
ndb_binlog_discover : bug#21806 2006-08-24 ndb_binlog_discover : bug#21806 2006-08-24
ndb_autodiscover3 : bug#21806 ndb_autodiscover3 : bug#21806
order_by : GKodinov - please fix bug #22457 in 5.1 also
sql/item.cc
View file @ bbc5d138
...@@ -3741,8 +3741,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference) ...@@ -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, Item** res= find_item_in_list(this, thd->lex->current_select->item_list,
&counter, REPORT_EXCEPT_NOT_FOUND, &counter, REPORT_EXCEPT_NOT_FOUND,
&not_used); &not_used);
if (res != (Item **)not_found_item && if (res != (Item **)not_found_item)
(*res)->type() == Item::FIELD_ITEM)
{ {
if ((*res)->type() == Item::FIELD_ITEM) if ((*res)->type() == Item::FIELD_ITEM)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7