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

Merged 4.1 -> 5.0

Browse Source 
include/mysql_com.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2003-12-09 19:00:34 +01:00
parent 8b915a4316 9388c41953
commit aaac51ea98
69 changed files with 727 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_load.cc
View File

@ -756,8 +756,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;
@ -943,7 +942,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);