1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215

Browse Source 
into  polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215


client/mysql.cc:
  Auto merged
This commit is contained in:
unknown 2007-11-05 13:32:14 +03:00
commit 9e190d3791
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysql.cc
View File

@ -1365,10 +1365,9 @@ static bool add_line(String &buffer,char *line,char *in_string,
}
}
else if (!*ml_comment && !*in_string &&
(out - line) >= 9 &&
!my_strnncoll(charset_info, (uchar*) pos, 9,
(const uchar*) "delimiter", 9) &&
my_isspace(charset_info, pos[9]))
strlen(pos) >= 10 &&
!my_strnncoll(charset_info, (uchar*) pos, 10,
(const uchar*) "delimiter ", 10))
{
// Flush previously accepted characters
if (out != line)