Commit 02b913ad authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files

Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215 

into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
parents fa462599 910003b5

client/mysql.cc

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