diff options
author | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-05-12 03:41:51 +0100 |
---|---|---|
committer | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-05-12 03:41:51 +0100 |
commit | 9990ab901bbe1a99538d062d7b13c29ad84823a9 (patch) | |
tree | f443ca9eaf1444d71895bd1d3bd524e41d88cf29 /strings | |
parent | 6041d9c886b385ad61cdb37347d4763e4bef11b8 (diff) | |
parent | 9d80d48806b4b4a5fdf42b3985ca4b8610639e95 (diff) | |
download | mariadb-git-9990ab901bbe1a99538d062d7b13c29ad84823a9.tar.gz |
auto-merge Bug#11762799/Bug#55436
Diffstat (limited to 'strings')
-rw-r--r-- | strings/decimal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index e89669c3de5..32e35a64de7 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -320,8 +320,8 @@ int decimal_actual_fraction(decimal_t *from) from - value to convert to - points to buffer where string representation should be stored - *to_len - in: size of to buffer - out: length of the actually written string + *to_len - in: size of to buffer (incl. terminating '\0') + out: length of the actually written string (excl. '\0') fixed_precision - 0 if representation can be variable length and fixed_decimals will not be checked in this case. Put number as with fixed point position with this @@ -338,6 +338,7 @@ int decimal2string(decimal_t *from, char *to, int *to_len, int fixed_precision, int fixed_decimals, char filler) { + /* {intg_len, frac_len} output widths; {intg, frac} places in input */ int len, intg, frac= from->frac, i, intg_len, frac_len, fill; /* number digits before decimal point */ int fixed_intg= (fixed_precision ? |