diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-07-03 11:20:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-07-03 11:20:46 +0400 |
| commit | 3ccf8218bc03a9cc598cd2da5c5a98ea2412cc05 (patch) | |
| tree | e8bc6f5b4600582e87466c22bb7da52fe5cb72dc /sql/item_sum.h | |
| parent | f832b47833bd03fbb9e972508097f3f88c0ba184 (diff) | |
| download | mariadb-git-3ccf8218bc03a9cc598cd2da5c5a98ea2412cc05.tar.gz | |
Partial backporting of 7b50447aa6d051b8d14bb01ef14802cb8ffee223
(MDEV-9407, MDEV-9408) from 10.1
Needed to fix MDEV-10317 easier.
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 11d2f802af7..8568eaae907 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -481,7 +481,7 @@ public: } virtual void make_unique() { force_copy_fields= TRUE; } Item *get_tmp_table_item(THD *thd); - virtual Field *create_tmp_field(bool group, TABLE *table); + Field *create_tmp_field(bool group, TABLE *table); virtual bool collect_outer_ref_processor(uchar *param); bool init_sum_func_check(THD *thd); bool check_sum_func(THD *thd, Item **ref); @@ -1084,7 +1084,6 @@ public: fixed= true; } table_map used_tables() const { return (table_map) 1L; } - Field *tmp_table_field(TABLE *) { DBUG_ASSERT(0); return NULL; } void set_result_field(Field *) { DBUG_ASSERT(0); } void save_in_result_field(bool no_conversions) { DBUG_ASSERT(0); } }; |