Commit 910003b5 authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files

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.
parent 9cd5f49c

client/mysql.cc

+3 −4
Original line number Diff line number Diff line
@@ -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)