diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-27 16:25:52 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-27 16:25:52 +0100 |
| commit | 880b3d84d110a24ecb1fb7e053334f45d43b7210 (patch) | |
| tree | 08f5946df44304e74078c8398e52f0a45684cd67 /strings | |
| parent | c0f63d8564fdd1aacd001a882271dd896721d93a (diff) | |
| parent | 52fc261bcab0becc9d23f8d1e511760413a6d85d (diff) | |
| download | mariadb-git-880b3d84d110a24ecb1fb7e053334f45d43b7210.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
libmysql/libmysql.c:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/my_time.c:
Auto merged
strings/decimal.c:
Auto merged
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 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++; |