From 93f1df5ef7bbeded3f8def0b89d8507d269fa77f Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Nov 2007 13:30:31 +0300 Subject: [PATCH] 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. client/mysql.cc: Fixed code that parses the DELIMITER command to correctly calculate the length of the remaining input string. --- client/mysql.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/mysql.cc b/client/mysql.cc index 2c6d0df2274..a8d88bec274 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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)