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 polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215

Browse Source 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
This commit is contained in:
kaa@polly.(none)
2007-11-05 14:45:55 +03:00
parent fa462599ca 910003b544
commit 02b913ad26
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysql.cc
View File

@ -1352,10 +1352,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)