database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/usr/home/bar/mysql-4.1

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0
This commit is contained in:
bar@mysql.com
2005-07-26 16:43:47 +05:00
parent 4a85e560a5 637ec56206
commit a009ec4a9e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/ctype-gbk.c
View File

@ -9969,7 +9969,7 @@ uint my_well_formed_len_gbk(CHARSET_INFO *cs __attribute__((unused)),
break;
}
}
return b - b0;
return (uint) (b - b0);
}

8
strings/ctype-simple.c
View File

@ -1090,7 +1090,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)
if (*str == '.')
{
for(str++ ; str != end && *str == '0' ; str++);
return (ulong) (str-str0);
return (ulong) (str - str0);
}
return 0;
@ -1100,7 +1100,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)
if (!my_isspace(cs,*str))
break;
}
return (ulong) (str-str0);
return (ulong) (str - str0);
default:
return 0;
}
@ -1117,14 +1117,14 @@ void my_fill_8bit(CHARSET_INFO *cs __attribute__((unused)),
uint my_numchars_8bit(CHARSET_INFO *cs __attribute__((unused)),
const char *b, const char *e)
{
return (uint) (e-b);
return (uint) (e - b);
}
uint my_numcells_8bit(CHARSET_INFO *cs __attribute__((unused)),
const char *b, const char *e)
{
return (uint) (e-b);
return (uint) (e - b);
}

2
strings/ctype-sjis.c
View File

@ -213,7 +213,7 @@ static int my_strnncoll_sjis_internal(CHARSET_INFO *cs,
uint a_char= sjiscode(*a, *(a+1));
uint b_char= sjiscode(*b, *(b+1));
if (a_char != b_char)
return a_char - b_char;
return (int) a_char - (int) b_char;
a += 2;
b += 2;
} else