summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-04-01 15:52:09 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-04-01 15:52:09 +0500
commit0f3c8b927c85ee8df12cd9bce9620bd11900684f (patch)
treee150b071b41bd913be7a617346c394420d40ce95 /sql/sql_load.cc
parentc53e108deac5b5aefef99c3afe776d6716b4205f (diff)
downloadmariadb-git-0f3c8b927c85ee8df12cd9bce9620bd11900684f.tar.gz
mbcharlen() is now used instead of ismbhead(). The last one has been removed.
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 4f5b19e6f49..3c43c3d9e3a 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -702,7 +702,7 @@ int READ_INFO::read_field()
chr = GET;
#ifdef USE_MB
if (use_mb(read_charset) &&
- my_ismbhead(read_charset, chr) &&
+ (my_mbcharlen(read_charset, chr) >1 )&&
to+my_mbcharlen(read_charset, chr) <= end_of_buff)
{
uchar* p = (uchar*)to;
@@ -884,7 +884,7 @@ int READ_INFO::next_line()
{
int chr = GET;
#ifdef USE_MB
- if (use_mb(read_charset) && my_ismbhead(read_charset, chr))
+ if (use_mb(read_charset) && (my_mbcharlen(read_charset, chr) >1 ))
{
for (int i=1;
chr != my_b_EOF && i<my_mbcharlen(read_charset, chr);