1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

fix for my_mbcharlen(charset, c) to return 1 for single-byte characters

(isn't it obvious ?)
This commit is contained in:
serg@serg.mylan
2003-12-06 19:05:26 +01:00
parent cbcb863ca5
commit b2e6b36487
8 changed files with 9 additions and 10 deletions

View File

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