mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

Browse source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
This commit is contained in:
df@pippilotta.erinye.com 2007-12-21 09:44:08 +01:00
commit bea1bfd5c7
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/mysql.cc
View file

@ -1290,9 +1290,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
if (status.add_to_history && line[0] && not_in_history(line)) if (status.add_to_history && line[0] && not_in_history(line))
add_history(line); add_history(line);
#endif #endif
#ifdef USE_MB
char *end_of_line=line+(uint) strlen(line); char *end_of_line=line+(uint) strlen(line);
#endif
for (pos=out=line ; (inchar= (uchar) *pos) ; pos++) for (pos=out=line ; (inchar= (uchar) *pos) ; pos++)
{ {
@ -1382,7 +1380,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
} }
} }
else if (!*ml_comment && !*in_string && else if (!*ml_comment && !*in_string &&
strlen(pos) >= 10 && (end_of_line - pos) >= 10 &&
!my_strnncoll(charset_info, (uchar*) pos, 10, !my_strnncoll(charset_info, (uchar*) pos, 10,
(const uchar*) "delimiter ", 10)) (const uchar*) "delimiter ", 10))
{ {