mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge fix for MDEV-4942, 5.3->5.5

Browse source
This commit is contained in:
Sergey Petrunya 2013-08-26 16:23:14 +04:00
commit 7907b9b4da
4 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_select.cc
View file

@ -13642,7 +13642,8 @@ internal_remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value)
In these cases the disjunct/conjunct must be merged into the
argument list of cond.
*/
if (new_item->type() == Item::COND_ITEM)
if (new_item->type() == Item::COND_ITEM &&
item->type() == Item::COND_ITEM)
{
DBUG_ASSERT(((Item_cond *) cond)->functype() ==
((Item_cond *) new_item)->functype());