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 bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
This commit is contained in:
unknown
2003-12-08 12:26:10 +02:00
parent 8bf9ccb627 e505696ffc
commit 43b42ceee1
38 changed files with 193 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
strings/ctype-ujis.c
View File

@ -252,25 +252,25 @@ my_wc_mb_jisx0201(CHARSET_INFO *cs __attribute__((unused)),
uchar *e __attribute__((unused)))
{
if (wc <= 0x7D)
if ((int) wc <= 0x7D)
{
*s = wc;
*s = (uchar) wc;
return (wc == 0x5C) ? MY_CS_ILUNI : 1;
}
if (wc >= 0xFF61 && wc <= 0xFF9F)
{
*s = (wc - 0xFEC0);
*s = (uchar) (wc - 0xFEC0);
return 1;
}
if (wc==0x00A5)
if (wc == 0x00A5)
{
*s = 0x5C;
return 1;
}
if (wc==0x203E)
if (wc == 0x203E)
{
*s = 0x7E;
return 1;
@ -8349,12 +8349,12 @@ my_wc_mb_euc_jp(CHARSET_INFO *c,my_wc_t wc, unsigned char *s, unsigned char *e)
if (s >= e)
return MY_CS_TOOSMALL;
if (wc<0x80)
if ((int) wc < 0x80)
{
if (s>e)
return MY_CS_TOOSMALL;
*s=wc;
*s= (uchar) wc;
return 1;
}