diff options
| author | gkodinov@dl145s.mysql.com <> | 2006-11-27 16:25:52 +0100 |
|---|---|---|
| committer | gkodinov@dl145s.mysql.com <> | 2006-11-27 16:25:52 +0100 |
| commit | e74c9add4760d9bfb2638f4977dea25a0751fa0d (patch) | |
| tree | 08f5946df44304e74078c8398e52f0a45684cd67 /strings/decimal.c | |
| parent | 0421d489fbcdd1b9f3286f1981b7b3a275597b50 (diff) | |
| parent | 501333f694a0aaeeae1e9b0b8b5019d8c6357905 (diff) | |
| download | mariadb-git-e74c9add4760d9bfb2638f4977dea25a0751fa0d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
Diffstat (limited to 'strings/decimal.c')
| -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 e0b06685521..6b7a2266194 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++; |