1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Igor Babaev 2013-11-22 18:38:13 -08:00
commit 11eb7333f3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/item_cmpfunc.cc
View File

@ -5692,7 +5692,9 @@ void Item_equal::add_const(Item *c, Item *f)
func->quick_fix_field(); func->quick_fix_field();
cond_false= !func->val_int(); cond_false= !func->val_int();
} }
if (cond_false) if (with_const && equal_items.elements == 1)
cond_true= TRUE;
if (cond_false || cond_true)
const_item_cache= 1; const_item_cache= 1;
} }
@ -5946,9 +5948,6 @@ void Item_equal::update_const()
{ {
it.remove(); it.remove();
add_const(item); add_const(item);
if (equal_items.elements == 1)
cond_true= TRUE;
update_used_tables();
} }
} }
} }