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.cc | |
| 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.cc')
| -rw-r--r-- | sql/item_windowfunc.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_windowfunc.cc b/sql/item_windowfunc.cc index 66c4f5be665..b523235b3ad 100644 --- a/sql/item_windowfunc.cc +++ b/sql/item_windowfunc.cc @@ -122,7 +122,8 @@ Item_window_func::fix_fields(THD *thd, Item **ref) with_window_func= true; with_sum_func= false; - fix_length_and_dec(); + if (fix_length_and_dec()) + return TRUE; max_length= window_func()->max_length; maybe_null= window_func()->maybe_null; @@ -362,7 +363,8 @@ bool Item_sum_hybrid_simple::fix_fields(THD *thd, Item **ref) maybe_null= 1; result_field=0; null_value=1; - fix_length_and_dec(); + if (fix_length_and_dec()) + return TRUE; if (check_sum_func(thd, ref)) return TRUE; |