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

Merge mysql.com:/usr/home/bar/mysql-4.1

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0


client/mysql.cc:
  after merge fix.
This commit is contained in:
unknown
2005-10-14 14:17:15 +05:00
parent 40157b14e0 08bf55c71f
commit 344a892b8d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/mysql.cc
View File

@ -1193,11 +1193,16 @@ static bool add_line(String &buffer,char *line,char *in_string,
#ifdef USE_MB
int length;
if (use_mb(charset_info) &&
(length= my_ismbchar(charset_info, pos, end_of_line)))
(lenght= my_ismbchar(charset_info, pos, end_of_line)))
{
while (length--)
*out++ = *pos++;
pos--;
if (!*ml_comment)
{
while (lenght--)
*out++ = *pos++;
pos--;
}
else
pos+= lenght - 1;
continue;
}
#endif