diff options
| author | unknown <timour@mysql.com> | 2004-10-11 10:47:08 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2004-10-11 10:47:08 +0300 |
| commit | 81f7ade6627d3ab8f5e1100a97f7a3cd7ff5bad2 (patch) | |
| tree | 2d2171e514f0cdbc83a7e6963ba1e79dae224b27 /sql/sql_select.h | |
| parent | 65ed693681b17414fc001099ee734f36de847f13 (diff) | |
| parent | b0982f2182600b701b74c4dcb474dbfd4d6b45f8 (diff) | |
| download | mariadb-git-81f7ade6627d3ab8f5e1100a97f7a3cd7ff5bad2.tar.gz | |
Merge with implementation of WL#1724.
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/key.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/opt_range.cc:
Manual merge
sql/sql_select.cc:
Manual merge
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index eb80f3ee608..95b3b5e493e 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -303,7 +303,7 @@ class JOIN :public Sql_alloc void restore_tmp(); bool alloc_func_list(); bool make_sum_func_list(List<Item> &all_fields, List<Item> &send_fields, - bool before_group_by); + bool before_group_by, bool recompute= FALSE); inline void set_items_ref_array(Item **ptr) { @@ -399,6 +399,7 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param, uint find_shortest_key(TABLE *table, const key_map *usable_keys); /* functions from opt_sum.cc */ +bool simple_pred(Item_func *func_item, Item **args, bool *inv_order); int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds); /* from sql_delete.cc, used by opt_range.cc */ |