summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2007-09-28 22:38:21 +0200
committerkent@kent-amd64.(none) <>2007-09-28 22:38:21 +0200
commita9366e487890378758f7375f40c8c2ea242de26b (patch)
tree1ef18a98b93ef3c9e3b83968ab8577094c805815 /strings
parentca8bb3d96fc0caa62f56fec8b32c0bff0030b2fc (diff)
parent607721494f60fefcdd2838f19ad4641d8b5d843e (diff)
downloadmariadb-git-a9366e487890378758f7375f40c8c2ea242de26b.tar.gz
Merge mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
into mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-simple.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 6b71f29f0d2..5dce4aad75e 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -853,7 +853,7 @@ size_t my_long10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
{
if (val < 0)
{
- val= -val;
+ val= -(unsigned long int)val;
*dst++= '-';
len--;
sign= 1;
@@ -890,7 +890,7 @@ size_t my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
{
if (val < 0)
{
- val = -val;
+ val = -(ulonglong)val;
*dst++= '-';
len--;
sign= 1;