diff options
| author | holyfoot/hf@deer.(none) <> | 2006-11-06 11:01:35 +0400 |
|---|---|---|
| committer | holyfoot/hf@deer.(none) <> | 2006-11-06 11:01:35 +0400 |
| commit | 7e1c6b480d43bccf185f780e176e07042cce9c30 (patch) | |
| tree | 272bc6e990d3ef308892c731113336527092a69d /strings | |
| parent | 99b572b9ebdcc0fe1037bd764d58cf35fca2090d (diff) | |
| parent | 18577a8e8f8d9a14cb0d64061d94c227d8520eef (diff) | |
| download | mariadb-git-7e1c6b480d43bccf185f780e176e07042cce9c30.tar.gz | |
Merge mysql.com:/home/hf/work/8663/my50-8663
into mysql.com:/home/hf/work/8663/my51-8663
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 4ff2b5a693a..2eea721af36 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1042,7 +1042,7 @@ int decimal2ulonglong(decimal_t *from, ulonglong *to) x=x*DIG_BASE + *buf++; if (unlikely(y > ((ulonglong) ULONGLONG_MAX/DIG_BASE) || x < y)) { - *to=y; + *to=ULONGLONG_MAX; return E_DEC_OVERFLOW; } } |