diff options
| author | monty@mysql.com/nosik.monty.fi <> | 2006-11-20 22:46:52 +0200 |
|---|---|---|
| committer | monty@mysql.com/nosik.monty.fi <> | 2006-11-20 22:46:52 +0200 |
| commit | 306b871d522b1fa744abf78acaafab2379a98401 (patch) | |
| tree | 352c3fca9ea50d4ca34dacb71d6f6ec2a89df543 /strings | |
| parent | 4e9ef283efa621ad3acafce39978bc8f29b97931 (diff) | |
| parent | e82587980037d3c27d84411c332d812d47f424bd (diff) | |
| download | mariadb-git-306b871d522b1fa744abf78acaafab2379a98401.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
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 5a0bc0968b6..3b51d089c22 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1348,7 +1348,7 @@ int bin2decimal(char *from, decimal_t *to, int precision, int scale) } from+=i; *buf=x ^ mask; - if (((uint32)*buf) >= powers10[intg0x+1]) + if (((ulonglong)*buf) >= (ulonglong) powers10[intg0x+1]) goto err; if (buf > to->buf || *buf != 0) buf++; |