summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2017-11-13 11:06:18 +0300
committerAleksey Midenkov <midenok@gmail.com>2017-11-13 19:09:46 +0300
commit497c6add88edae9c7ec6d6d840c0ed65adc016be (patch)
tree92eb05976137821fcdf0caf556495a5b55436db0 /sql/sql_select.h
parentd8d725101992d50b00edf149e7ccd7f720b850dc (diff)
parenta48aa0cd569eda88bef98ed4abe41b0b570fcd51 (diff)
downloadmariadb-git-497c6add88edae9c7ec6d6d840c0ed65adc016be.tar.gz
System Versioning pre1.0
Merge branch '10.3' into trunk
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index b57452f8934..4902f99e4ec 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1464,6 +1464,8 @@ public:
ordered_index_usage= ordered_index_void;
need_distinct= 0;
skip_sort_order= 0;
+ with_two_phase_optimization= 0;
+ is_for_splittable_grouping_derived= 0;
need_tmp= 0;
hidden_group_fields= 0; /*safety*/
error= 0;
@@ -1676,6 +1678,7 @@ public:
bool inject_cond_into_where(Item *injected_cond);
bool push_splitting_cond_into_derived(THD *thd, Item *cond);
bool improve_chosen_plan(THD *thd);
+ bool transform_in_predicates_into_in_subq(THD *thd);
private:
/**
Create a temporary table to be used for processing DISTINCT/ORDER
@@ -1707,6 +1710,7 @@ private:
void optimize_distinct();
void cleanup_item_list(List<Item> &items) const;
+ bool add_having_as_table_cond(JOIN_TAB *tab);
bool make_aggr_tables_info();
};