database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Fixed bug mdev-4942.

Browse Source 
Made sure that degenerate conjunctions/disjunctions are obtained from
AND/OR conditions.
This commit is contained in:
Igor Babaev
2013-08-23 22:17:02 -07:00
parent c40de1df36
commit dbc84ff96c
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

@@ -13350,7 +13350,8 @@ 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());