database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-4.1/

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
unknown
2003-12-06 19:05:57 +01:00
parent 07de836b44 2e82008bac
commit afbeb64e93
8 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/charset.c
View File

@@ -82,7 +82,7 @@ static void init_state_maps(CHARSET_INFO *cs)
else if (my_isdigit(cs,i)) else if (my_isdigit(cs,i))
state_map[i]=(uchar) MY_LEX_NUMBER_IDENT; state_map[i]=(uchar) MY_LEX_NUMBER_IDENT;
#if defined(USE_MB) && defined(USE_MB_IDENT) #if defined(USE_MB) && defined(USE_MB_IDENT)
else if (use_mb(cs) && (my_mbcharlen(cs, i)>1)) else if (my_mbcharlen(cs, i)>1)
state_map[i]=(uchar) MY_LEX_IDENT; state_map[i]=(uchar) MY_LEX_IDENT;
#endif #endif
else if (!my_isgraph(cs,i)) else if (!my_isgraph(cs,i))

5
sql/sql_load.cc
View File

@@ -759,8 +759,7 @@ int READ_INFO::read_field()
{ {
chr = GET; chr = GET;
#ifdef USE_MB #ifdef USE_MB
if (use_mb(read_charset) && if ((my_mbcharlen(read_charset, chr) > 1) &&
(my_mbcharlen(read_charset, chr) >1 )&&
to+my_mbcharlen(read_charset, chr) <= end_of_buff) to+my_mbcharlen(read_charset, chr) <= end_of_buff)
{ {
uchar* p = (uchar*)to; uchar* p = (uchar*)to;
@@ -946,7 +945,7 @@ int READ_INFO::next_line()
{ {
int chr = GET; int chr = GET;
#ifdef USE_MB #ifdef USE_MB
if (use_mb(read_charset) && (my_mbcharlen(read_charset, chr) >1 )) if (my_mbcharlen(read_charset, chr) > 1)
{ {
for (int i=1; for (int i=1;
chr != my_b_EOF && i<my_mbcharlen(read_charset, chr); chr != my_b_EOF && i<my_mbcharlen(read_charset, chr);

2
strings/ctype-big5.c
View File

@@ -401,7 +401,7 @@ static int ismbchar_big5(CHARSET_INFO *cs __attribute__((unused)),
static int mbcharlen_big5(CHARSET_INFO *cs __attribute__((unused)), uint c) static int mbcharlen_big5(CHARSET_INFO *cs __attribute__((unused)), uint c)
{ {
return (isbig5head(c)? 2: 0); return (isbig5head(c)? 2 : 1);
} }
/* page 0 0xA140-0xC7FC */ /* page 0 0xA140-0xC7FC */

2
strings/ctype-euc_kr.c
View File

@@ -193,7 +193,7 @@ static int ismbchar_euc_kr(CHARSET_INFO *cs __attribute__((unused)),
static int mbcharlen_euc_kr(CHARSET_INFO *cs __attribute__((unused)),uint c) static int mbcharlen_euc_kr(CHARSET_INFO *cs __attribute__((unused)),uint c)
{ {
return (iseuc_kr(c) ? 2 : 0); return (iseuc_kr(c) ? 2 : 1);
} }

2
strings/ctype-gb2312.c
View File

@@ -174,7 +174,7 @@ static int ismbchar_gb2312(CHARSET_INFO *cs __attribute__((unused)),
static int mbcharlen_gb2312(CHARSET_INFO *cs __attribute__((unused)),uint c) static int mbcharlen_gb2312(CHARSET_INFO *cs __attribute__((unused)),uint c)
{ {
return (isgb2312head(c)? 2:0); return (isgb2312head(c)? 2 : 1);
} }

2
strings/ctype-gbk.c
View File

@@ -2721,7 +2721,7 @@ static int ismbchar_gbk(CHARSET_INFO *cs __attribute__((unused)),
static int mbcharlen_gbk(CHARSET_INFO *cs __attribute__((unused)),uint c) static int mbcharlen_gbk(CHARSET_INFO *cs __attribute__((unused)),uint c)
{ {
return (isgbkhead(c)? 2:0); return (isgbkhead(c)? 2 : 1);
} }
/* page 0 0x8140-0xFE4F */ /* page 0 0x8140-0xFE4F */

2
strings/ctype-sjis.c
View File

@@ -191,7 +191,7 @@ static int ismbchar_sjis(CHARSET_INFO *cs __attribute__((unused)),
static int mbcharlen_sjis(CHARSET_INFO *cs __attribute__((unused)),uint c) static int mbcharlen_sjis(CHARSET_INFO *cs __attribute__((unused)),uint c)
{ {
return (issjishead((uchar) c) ? 2: 0); return (issjishead((uchar) c) ? 2 : 1);
} }

2
strings/ctype-ujis.c
View File

@@ -196,7 +196,7 @@ static int ismbchar_ujis(CHARSET_INFO *cs __attribute__((unused)),
static int mbcharlen_ujis(CHARSET_INFO *cs __attribute__((unused)),uint c) static int mbcharlen_ujis(CHARSET_INFO *cs __attribute__((unused)),uint c)
{ {
return (isujis(c)? 2: isujis_ss2(c)? 2: isujis_ss3(c)? 3: 0); return (isujis(c)? 2: isujis_ss2(c)? 2: isujis_ss3(c)? 3: 1);
} }