diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-11-28 17:14:16 +0100 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-11-28 17:14:16 +0100 |
| commit | 32c9e11df9e76454a3a0b49004f29722cc28295f (patch) | |
| tree | 83a78303b4c4267413216f751a1b6558df61ee99 /strings | |
| parent | 93f246d4c196d813f3870586534372d13b51fb03 (diff) | |
| parent | b7e72c7ba917c9c445c14f0338032c2fc4351d72 (diff) | |
| download | mariadb-git-32c9e11df9e76454a3a0b49004f29722cc28295f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
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 bb90978129d..6070271c684 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; } } |