Commit f25c6ffa authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
parents 92de4d5e f7527b78

client/mysql.cc

+1 −3
Original line number Diff line number Diff line
@@ -1272,9 +1272,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
  if (status.add_to_history && line[0] && not_in_history(line))

    add_history(line);

#endif

#ifdef USE_MB

  char *end_of_line=line+(uint) strlen(line);

#endif



  for (pos=out=line ; (inchar= (uchar) *pos) ; pos++)

  {
@@ -1364,7 +1362,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
      }

    }

    else if (!*ml_comment && !*in_string &&

             strlen(pos) >= 10 &&

             (end_of_line - pos) >= 10 &&

             !my_strnncoll(charset_info, (uchar*) pos, 10,

                           (const uchar*) "delimiter ", 10))

    {