diff options
| author | unknown <sanja@askmonty.org> | 2011-09-02 15:10:10 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2011-09-02 15:10:10 +0300 |
| commit | b152c4c71dff8b2142e220850d9329fe63f4cfbd (patch) | |
| tree | 585b0d57da5c535a64dc5393a268e2d4c81c2066 /sql/item_subselect.cc | |
| parent | ea8aa329099ee28ec6f1266d8d01a6fc664259cf (diff) | |
| parent | 37a8497d494ea256ff4b13a89e62150e06a17dae (diff) | |
| download | mariadb-git-b152c4c71dff8b2142e220850d9329fe63f4cfbd.tar.gz | |
Merge 5.2->5.3
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 204279115da..aeea568a930 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -822,7 +822,10 @@ Item_maxmin_subselect::Item_maxmin_subselect(THD *thd_param, { DBUG_ENTER("Item_maxmin_subselect::Item_maxmin_subselect"); max= max_arg; - init(select_lex, new select_max_min_finder_subselect(this, max_arg)); + init(select_lex, + new select_max_min_finder_subselect(this, max_arg, + parent->substype() == + Item_subselect::ALL_SUBS)); max_columns= 1; maybe_null= 1; max_columns= 1; @@ -1598,11 +1601,20 @@ bool Item_allany_subselect::transform_into_max_min(JOIN *join) */ DBUG_ASSERT(!substitution); - if (!select_lex->group_list.elements && - !select_lex->having && - !select_lex->with_sum_func && - !(select_lex->next_select()) && - select_lex->table_list.elements) + /* + Check if optimization with aggregate min/max possible + 1 There is no aggregate in the subquery + 2 It is not UNION + 3 There is tables + 4 It is not ALL subquery with possible NULLs in the SELECT list + */ + if (!select_lex->group_list.elements && /*1*/ + !select_lex->having && /*1*/ + !select_lex->with_sum_func && /*1*/ + !(select_lex->next_select()) && /*2*/ + select_lex->table_list.elements && /*3*/ + (!select_lex->ref_pointer_array[0]->maybe_null || /*4*/ + substype() != Item_subselect::ALL_SUBS)) /*4*/ { Item_sum_hybrid *item; nesting_map save_allow_sum_func; |