summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-11-12 13:50:37 +0100
committerunknown <kent@kent-amd64.(none)>2007-11-12 13:50:37 +0100
commit9ceb48bd1a7b9d34ed7759ec13519c66c1a75161 (patch)
treea6b5742a23cc10ae7fabc95e81376a20d3c37d17 /strings
parentc244507be2b1cd5e64e17424cf779d8a085e13e3 (diff)
parentc6d519e193e1a51d8fa56454ffd9a512134ba513 (diff)
downloadmariadb-git-9ceb48bd1a7b9d34ed7759ec13519c66c1a75161.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.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;