diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-17 16:50:15 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-17 16:50:15 +0100 |
| commit | 13ba0dd286f3296bfbbd202fa76d47770734b472 (patch) | |
| tree | 5790c99069390098160a26ac5b05215f4179f818 /strings | |
| parent | ecf04668a2db3d7fc91e421e68eeb5ab25064aa0 (diff) | |
| download | mariadb-git-13ba0dd286f3296bfbbd202fa76d47770734b472.tar.gz | |
MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when converting to DECIMAL" on a query with aggregate functions and GROUP BY
fix: don't call field->val_decimal() if the field->is_null()
because the buffer at field->ptr might not hold a valid decimal value
sql/item_sum.cc:
do not call field->val_decimal() if the field->is_null()
storage/maria/ma_blockrec.c:
cleanup
storage/maria/ma_rrnd.c:
cleanup
strings/decimal.c:
typo
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/decimal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index 032cee938d3..e4925ff5f7c 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1190,7 +1190,7 @@ int decimal2longlong(const decimal_t *from, longlong *to) And for -1234567890.1234 it would be - 7E F2 04 37 2D FB 2D + 7E F2 04 C7 2D FB 2D */ int decimal2bin(const decimal_t *from, uchar *to, int precision, int frac) { |