Commit 344a892b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1 

into  mysql.com:/usr/home/bar/mysql-5.0


client/mysql.cc:
  after merge fix.
parents 40157b14 08bf55c7

client/mysql.cc

+9 −4
Original line number Diff line number Diff line
@@ -1193,11 +1193,16 @@ static bool add_line(String &buffer,char *line,char *in_string, 
#ifdef USE_MB

    int length;

    if (use_mb(charset_info) &&

        (length= my_ismbchar(charset_info, pos, end_of_line)))

        (lenght= my_ismbchar(charset_info, pos, end_of_line)))

    {

      while (length--)

      if (!*ml_comment)

      {

        while (lenght--)

          *out++ = *pos++;

        pos--;

      }

      else

        pos+= lenght - 1;

      continue;

    }

#endif