summaryrefslogtreecommitdiff
path: root/sql/my_decimal.h
diff options
context:
space:
mode:
authorTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2011-05-12 03:41:51 +0100
committerTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2011-05-12 03:41:51 +0100
commit9990ab901bbe1a99538d062d7b13c29ad84823a9 (patch)
treef443ca9eaf1444d71895bd1d3bd524e41d88cf29 /sql/my_decimal.h
parent6041d9c886b385ad61cdb37347d4763e4bef11b8 (diff)
parent9d80d48806b4b4a5fdf42b3985ca4b8610639e95 (diff)
downloadmariadb-git-9990ab901bbe1a99538d062d7b13c29ad84823a9.tar.gz
auto-merge Bug#11762799/Bug#55436
Diffstat (limited to 'sql/my_decimal.h')
-rw-r--r--sql/my_decimal.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index a5077f397e3..97546c91da1 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -55,7 +55,7 @@ C_MODE_END
/**
maximum length of string representation (number of maximum decimal
- digits + 1 position for sign + 1 position for decimal point)
+ digits + 1 position for sign + 1 position for decimal point, no terminator)
*/
#define DECIMAL_MAX_STR_LENGTH (DECIMAL_MAX_POSSIBLE_PRECISION + 2)
@@ -212,6 +212,7 @@ inline uint32 my_decimal_precision_to_length(uint precision, uint8 scale,
inline
int my_decimal_string_length(const my_decimal *d)
{
+ /* length of string representation including terminating '\0' */
return decimal_string_size(d);
}