diff options
| author | msvensson@neptunus.(none) <> | 2006-12-04 19:28:38 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-12-04 19:28:38 +0100 |
| commit | 128b73fc36c858e457bf29ed44cb08f16677a9b5 (patch) | |
| tree | 4709d201720e18f147c369d52ae2cde47bec6b24 /strings | |
| parent | 544d0c909bd634c73e04cb018617c8cc9099147c (diff) | |
| parent | d253588c699ef2e589fb2d38aff7f78c8e25063c (diff) | |
| download | mariadb-git-128b73fc36c858e457bf29ed44cb08f16677a9b5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
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 7484f3c0d92..fc9cbfc9d21 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -1503,7 +1503,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)), else { *error= 0; - return (ulonglong) (longlong) (long) -ul; + return (ulonglong) (longlong) -(long) ul; } } else @@ -1654,7 +1654,7 @@ ret_sign: return (ulonglong) LONGLONG_MIN; } *error= 0; - return (ulonglong) -ull; + return (ulonglong) -(longlong) ull; } else { |