diff options
author | kent@kent-amd64.(none) <> | 2007-11-12 13:50:37 +0100 |
---|---|---|
committer | kent@kent-amd64.(none) <> | 2007-11-12 13:50:37 +0100 |
commit | 1979c915f9aa32695927fd656c954c3b30ac68ae (patch) | |
tree | a6b5742a23cc10ae7fabc95e81376a20d3c37d17 /strings | |
parent | 6ca70a0210cec88aadb195155d9d54f41ca5af3d (diff) | |
parent | a9366e487890378758f7375f40c8c2ea242de26b (diff) | |
download | mariadb-git-1979c915f9aa32695927fd656c954c3b30ac68ae.tar.gz |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-simple.c | 4 |
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; |