diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-11-12 13:13:43 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-11-12 13:13:43 +0100 |
| commit | fc71ff899ba5247655bb9a03867e44ee13460f3e (patch) | |
| tree | c22e5948f1ce83e38801865101d4ad71a62f10f2 /strings | |
| parent | 836398b98e73256bef89d50edd6bef14f25735c6 (diff) | |
| parent | 568f624406fb6771f5815bbe6184de6909270488 (diff) | |
| download | mariadb-git-fc71ff899ba5247655bb9a03867e44ee13460f3e.tar.gz | |
Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
into mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
mysql-test/t/bigint.test:
Auto merged
strings/ctype-simple.c:
Auto merged
mysql-test/r/bigint.result:
SCCS 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; |