database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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; break;
} }
} }
return b - b0; return (uint) (b - b0);
} }

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 a_char= sjiscode(*a, *(a+1));
uint b_char= sjiscode(*b, *(b+1)); uint b_char= sjiscode(*b, *(b+1));
if (a_char != b_char) if (a_char != b_char)
return a_char - b_char; return (int) a_char - (int) b_char;
a += 2; a += 2;
b += 2; b += 2;
} else } else