diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-01 14:26:15 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-01 14:26:15 +0100 |
| commit | 8e1e2856f2523c225a81840059e93fa9f61fbacf (patch) | |
| tree | f1c708faf5aaeb27f255531d8c0f9dac32833b5b /sql/my_decimal.h | |
| parent | b0ff791618d97487fb7515d3f785b37f46eba132 (diff) | |
| parent | 80c951ce2875aac521b82323b5b6ebf638593445 (diff) | |
| download | mariadb-git-8e1e2856f2523c225a81840059e93fa9f61fbacf.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index 2db08bf01e3..4c1f41463d5 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -217,15 +217,15 @@ public: { return to_string(to, 0, 0, 0); } - String *to_string_round(String *to, uint scale, my_decimal *round_buff) const + String *to_string_round(String *to, int scale, my_decimal *round_buff) const { (void) round_to(round_buff, scale, HALF_UP); // QQ: check result? return round_buff->to_string(to); } - int round_to(my_decimal *to, uint scale, decimal_round_mode mode, + int round_to(my_decimal *to, int scale, decimal_round_mode mode, int mask= E_DEC_FATAL_ERROR) const { - return check_result(mask, decimal_round(this, to, (int) scale, mode)); + return check_result(mask, decimal_round(this, to, scale, mode)); } int to_binary(uchar *bin, int prec, int scale, uint mask= E_DEC_FATAL_ERROR) const; |