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

Fixed code that parses the DELIMITER command to correctly calculate

Browse Source 
the length of the remaining input string.

This is to fix mysqldump test failure in PB introduced by the patch
for bug #26215.


client/mysql.cc:
  Fixed code that parses the DELIMITER command to correctly calculate 
  the length of the remaining input string.
This commit is contained in:
unknown 2007-11-05 13:30:31 +03:00
parent 1daa54d697
commit 93f1df5ef7
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

@ -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)