diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-04-15 08:54:05 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-04-15 08:54:05 +0200 |
| commit | 9cd03942ab81201add2eb537a9987f65992eda52 (patch) | |
| tree | 03f21dfd4ad78e88583ecd35be0a32609b86ef31 /sql/sql_select.h | |
| parent | b655b931be7384b66b2ec6f85204f249c5c819ae (diff) | |
| parent | dd3d9477b25b546407e18b4b474e766db1709aa7 (diff) | |
| download | mariadb-git-9cd03942ab81201add2eb537a9987f65992eda52.tar.gz | |
Merge fix for Bug#11765713 from 5.1
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 bdb9d1a315c..ea4a22527d3 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -619,7 +619,8 @@ bool is_indexed_agg_distinct(JOIN *join, List<Item_field> *out_args); /* 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); +int opt_sum_query(THD* thd, + TABLE_LIST *tables, List<Item> &all_fields, COND *conds); /* from sql_delete.cc, used by opt_range.cc */ extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b); |