database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-8661 Wrong result for SELECT..WHERE a='a' AND a='a' COLLATE latin1_bin

Browse Source 
MDEV-8679 Equal field propagation is not used for VARCHAR when it safely could
This commit is contained in:
Alexander Barkov
2015-08-26 22:32:01 +04:00
parent c0b7bf2625
commit 1b6b44b6b5
9 changed files with 198 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_select.cc
View File

@ -13077,11 +13077,7 @@ COND *Item_func::build_equal_items(THD *thd, COND_EQUAL *inherited,
as soon the field is not of a string type or the field reference is
an argument of a comparison predicate.
*/
uchar* is_subst_valid= (uchar *) Item::ANY_SUBST;
COND *cond= compile(thd, &Item::subst_argument_checker,
&is_subst_valid,
&Item::equal_fields_propagator,
(uchar *) inherited);
COND *cond= propagate_equal_fields(thd, ANY_SUBST, inherited);
cond->update_used_tables();
DBUG_ASSERT(cond == this);
DBUG_ASSERT(!cond_equal_ref || !cond_equal_ref[0]);
@ -14906,11 +14902,7 @@ void propagate_new_equalities(THD *thd, Item *cond,
}
else
{
uchar* is_subst_valid= (uchar *) Item::ANY_SUBST;
cond= cond->compile(thd, &Item::subst_argument_checker,
&is_subst_valid,
&Item::equal_fields_propagator,
(uchar *) inherited);
cond= cond->propagate_equal_fields(thd, Item::ANY_SUBST, inherited);
cond->update_used_tables();
}
}