diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-09-28 22:36:30 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-09-28 22:36:30 +0200 |
| commit | a155a59f1514624cfc51a0985d7dd3afc058301b (patch) | |
| tree | 919ae89f0a8c345b9ff5d82906f4b7f1dc14c747 /strings | |
| parent | d8ed4e2a57112e49d8b71748c8bd27fd35e0a769 (diff) | |
| parent | 5c04a99e2afda8c6fddb2572cd6f9e975aa52238 (diff) | |
| download | mariadb-git-a155a59f1514624cfc51a0985d7dd3afc058301b.tar.gz | |
Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
into mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
strings/ctype-simple.c:
Auto merged
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 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; |