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

16
strings/ctype-sjis.c
View File

@ -4428,16 +4428,16 @@ my_wc_mb_sjis(CHARSET_INFO *cs __attribute__((unused)),
if (s >= e)
return MY_CS_TOOSMALL;
if(wc<0x80)
if ((int) wc < 0x80)
{
s[0]=wc;
s[0]= (uchar) wc;
return 1;
}
if(!(code=func_uni_sjis_onechar(wc)))
if (!(code=func_uni_sjis_onechar(wc)))
return MY_CS_ILUNI;
if(s+2>e)
if (s+2>e)
return MY_CS_TOOSMALL;
s[0]=code>>8;
@ -4445,6 +4445,7 @@ my_wc_mb_sjis(CHARSET_INFO *cs __attribute__((unused)),
return 2;
}
static int
my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)),
my_wc_t *pwc, const uchar *s, const uchar *e){
@ -4453,16 +4454,16 @@ my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)),
if (s >= e)
return MY_CS_TOOFEW(0);
if(hi<0x80)
if (hi<0x80)
{
pwc[0]=hi;
return 1;
}
if(s+2>e)
if (s+2>e)
return MY_CS_TOOFEW(0);
if(!(pwc[0]=func_sjis_uni_onechar((hi<<8)+s[1])))
if (!(pwc[0]=func_sjis_uni_onechar((hi<<8)+s[1])))
return MY_CS_ILSEQ;
return 2;
@ -4481,6 +4482,7 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
my_hash_sort_simple,
};
static MY_CHARSET_HANDLER my_charset_handler=
{
ismbchar_sjis,