Commit c6d519e1 authored by unknown's avatar unknown

Merge mysql.com:/home/kent/bk/bug30069/mysql-5.0-build

into  mysql.com:/home/kent/bk/bug30069/mysql-5.1-build


strings/ctype-simple.c:
  Auto merged
parents 7571c81f a155a59f
...@@ -853,7 +853,7 @@ size_t my_long10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)), ...@@ -853,7 +853,7 @@ size_t my_long10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
{ {
if (val < 0) if (val < 0)
{ {
val= -val; val= -(unsigned long int)val;
*dst++= '-'; *dst++= '-';
len--; len--;
sign= 1; sign= 1;
...@@ -890,7 +890,7 @@ size_t my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)), ...@@ -890,7 +890,7 @@ size_t my_longlong10_to_str_8bit(CHARSET_INFO *cs __attribute__((unused)),
{ {
if (val < 0) if (val < 0)
{ {
val = -val; val = -(ulonglong)val;
*dst++= '-'; *dst++= '-';
len--; len--;
sign= 1; sign= 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment