diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 17:40:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 17:40:53 +0100 |
| commit | febe1e850342ea52ce0900ba5767852b0aa42dc7 (patch) | |
| tree | af188bde7aff4951c9f845a5c22912222b6ca888 /sql/opt_subselect.cc | |
| parent | d3681c18f96ebf9b66c7541459b2eb34a4827734 (diff) | |
| parent | a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768 (diff) | |
| download | mariadb-git-febe1e850342ea52ce0900ba5767852b0aa42dc7.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 12ae3286159..88204ef4102 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1008,6 +1008,10 @@ bool check_for_outer_joins(List<TABLE_LIST> *join_list) void find_and_block_conversion_to_sj(Item *to_find, List_iterator_fast<Item_in_subselect> &li) { + if (to_find->type() == Item::FUNC_ITEM && + ((Item_func*)to_find)->functype() == Item_func::IN_OPTIMIZER_FUNC) + to_find= ((Item_in_optimizer*)to_find)->get_wrapped_in_subselect_item(); + if (to_find->type() != Item::SUBSELECT_ITEM || ((Item_subselect *) to_find)->substype() != Item_subselect::IN_SUBS) return; |