summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2018-06-03 10:34:41 -0700
committerIgor Babaev <igor@askmonty.org>2018-06-03 10:34:41 -0700
commitcab1d6382623f0611335caf2cd056aa7ee04d7cd (patch)
treec33b8118a77a78d87d8fb01e908dbfa6a67ca9a2 /sql/item_sum.h
parentffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff)
parentee5124d714ea01f4e1bd6decf6da38b05c1009ad (diff)
downloadmariadb-git-cab1d6382623f0611335caf2cd056aa7ee04d7cd.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 96f115357f9..b0dea818f01 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -1297,11 +1297,16 @@ public:
Item_sum_sp(THD *thd, Name_resolution_context *context_arg, sp_name *name,
sp_head *sp, List<Item> &list);
+ Item_sum_sp(THD *thd, Item_sum_sp *item);
enum Sumfunctype sum_func () const
{
return SP_AGGREGATE_FUNC;
}
+ Field *create_field_for_create_select(TABLE *table)
+ {
+ return create_table_field_from_handler(table);
+ }
void fix_length_and_dec();
bool fix_fields(THD *thd, Item **ref);
const char *func_name() const;
@@ -1362,6 +1367,7 @@ public:
}
Item *get_copy(THD *thd)
{ return get_item_copy<Item_sum_sp>(thd, this); }
+ Item *copy_or_same(THD *thd);
};
/* Items to get the value of a stored sum function */