summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-03-23 17:40:53 +0100
committerSergei Golubchik <serg@mariadb.org>2018-03-23 17:40:53 +0100
commitfebe1e850342ea52ce0900ba5767852b0aa42dc7 (patch)
treeaf188bde7aff4951c9f845a5c22912222b6ca888 /sql/item_subselect.cc
parentd3681c18f96ebf9b66c7541459b2eb34a4827734 (diff)
parenta2e47f8c41e60fb0eeaa01cdd41fc07b9c963768 (diff)
downloadmariadb-git-febe1e850342ea52ce0900ba5767852b0aa42dc7.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 7dbaf313ad9..b275f749f25 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1818,7 +1818,7 @@ Item_in_subselect::single_value_transformer(JOIN *join)
Item* join_having= join->having ? join->having : join->tmp_having;
if (!(join_having || select_lex->with_sum_func ||
select_lex->group_list.elements) &&
- select_lex->table_list.elements == 0 &&
+ select_lex->table_list.elements == 0 && !join->conds &&
!select_lex->master_unit()->is_union())
{
Item *where_item= (Item*) select_lex->item_list.head();