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

Fixed code that parses the DELIMITER command to correctly calculate

the length of the remaining input string.

This is to fix mysqldump test failure in PB introduced by the patch
for bug #26215.
This commit is contained in:
kaa@polly.(none)
2007-11-05 13:30:31 +03:00
parent 9cd5f49c53
commit 910003b544

View File

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