diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-19 14:51:50 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-19 14:51:50 +0200 |
| commit | 083279f7838d45c475344d20585ead72a147a21d (patch) | |
| tree | c3ff5b3f6af1c9009b35d9b2560a7073be41ce90 /sql/item_windowfunc.h | |
| parent | 0121d5a790983c08dabedc66e70f862e47f7c8c7 (diff) | |
| parent | 6b8802e8dd5467556a024d807a1df23940b00895 (diff) | |
| download | mariadb-git-083279f7838d45c475344d20585ead72a147a21d.tar.gz | |
Merge commit '6b8802e8dd5467556a024d807a1df23940b00895' into bb-10.3-fix_len_decbb-10.3-fix_len_dec
Diffstat (limited to 'sql/item_windowfunc.h')
| -rw-r--r-- | sql/item_windowfunc.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sql/item_windowfunc.h b/sql/item_windowfunc.h index cb85a2c06d1..48851da7d96 100644 --- a/sql/item_windowfunc.h +++ b/sql/item_windowfunc.h @@ -526,10 +526,11 @@ class Item_sum_percent_rank: public Item_sum_window_with_row_count bool add(); const Type_handler *type_handler() const { return &type_handler_double; } - void fix_length_and_dec() + bool fix_length_and_dec() { decimals = 10; // TODO-cvicentiu find out how many decimals the standard // requires. + return FALSE; } void setup_window_func(THD *thd, Window_spec *window_spec); @@ -614,10 +615,11 @@ class Item_sum_cume_dist: public Item_sum_window_with_row_count void update_field() {} const Type_handler *type_handler() const { return &type_handler_double; } - void fix_length_and_dec() + bool fix_length_and_dec() { decimals = 10; // TODO-cvicentiu find out how many decimals the standard // requires. + return FALSE; } Item *get_copy(THD *thd) @@ -820,10 +822,11 @@ public: const Type_handler *type_handler() const {return Type_handler_hybrid_field_type::type_handler();} - void fix_length_and_dec() + bool fix_length_and_dec() { decimals = 10; // TODO-cvicentiu find out how many decimals the standard // requires. + return FALSE; } Item *get_copy(THD *thd) @@ -950,10 +953,11 @@ public: const Type_handler *type_handler() const {return Type_handler_hybrid_field_type::type_handler();} - void fix_length_and_dec() + bool fix_length_and_dec() { decimals = 10; // TODO-cvicentiu find out how many decimals the standard // requires. + return FALSE; } Item *get_copy(THD *thd) @@ -1292,9 +1296,10 @@ public: void split_sum_func(THD *thd, Ref_ptr_array ref_pointer_array, List<Item> &fields, uint flags); - void fix_length_and_dec() + bool fix_length_and_dec() { decimals = window_func()->decimals; + return FALSE; } const char* func_name() const { return "WF"; } |