summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2007-09-28 22:36:30 +0200
committerkent@kent-amd64.(none) <>2007-09-28 22:36:30 +0200
commit607721494f60fefcdd2838f19ad4641d8b5d843e (patch)
tree919ae89f0a8c345b9ff5d82906f4b7f1dc14c747 /strings
parent17fb92cce48e70e385887909bd26fbbc172e5ccc (diff)
parent33ad13280c22e0d5b1ba6bd6ceb920f49a678d95 (diff)
downloadmariadb-git-607721494f60fefcdd2838f19ad4641d8b5d843e.tar.gz
Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
into mysql.com:/home/kent/bk/bug30069/mysql-5.0-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 8b1b0d6790d..9f5c993dfa0 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -845,7 +845,7 @@ int my_long10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
{
if (val < 0)
{
- val= -val;
+ val= -(unsigned long int)val;
*dst++= '-';
len--;
sign= 1;
@@ -881,7 +881,7 @@ int my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
{
if (val < 0)
{
- val = -val;
+ val = -(ulonglong)val;
*dst++= '-';
len--;
sign= 1;