diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-01 11:02:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-02 09:36:04 +0300 |
| commit | 3d615e4b1aa4f945f69d310f9a19de80fbaccdca (patch) | |
| tree | 1d23c043ef41badf359760b70db84bc825a8b4a5 /sql/item_sum.h | |
| parent | 896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (diff) | |
| parent | 959891662dfbb0b860f0bc70e09bc2c92dab831b (diff) | |
| download | mariadb-git-3d615e4b1aa4f945f69d310f9a19de80fbaccdca.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
This excludes MDEV-12472 (InnoDB should accept XtraDB parameters,
warning that they are ignored). In other words, MariaDB 10.3 will not
recognize any XtraDB-specific parameters.
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index c1485738b11..65306ab6f48 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -508,10 +508,7 @@ public: } virtual void make_unique() { force_copy_fields= TRUE; } Item *get_tmp_table_item(THD *thd); - Field *create_tmp_field(bool group, TABLE *table) - { - return Item::create_tmp_field(group, table, MY_INT32_NUM_DECIMAL_DIGITS); - } + Field *create_tmp_field(bool group, TABLE *table); virtual bool collect_outer_ref_processor(void *param); bool init_sum_func_check(THD *thd); bool check_sum_func(THD *thd, Item **ref); |