diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 11:44:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 11:44:29 +0100 |
| commit | a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768 (patch) | |
| tree | 1846a0fdfdff14207698f563376afbdae5d33c8c /sql/opt_subselect.cc | |
| parent | 04921000594dcbdf23340850b9284fd30ccdb0fd (diff) | |
| parent | ddc5c65333a4add28907ccb82054ecba0ff6b873 (diff) | |
| download | mariadb-git-a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768.tar.gz | |
Merge branch '5.5' into 10.0
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 8aa04c62f42..a27218236bd 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1006,6 +1006,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; |