Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/work/4.1

client/mysql.cc

@@ -1094,14 +1094,13 @@ static bool add_line(String &buffer,char *line,char *in_string,
     {						// Add found char to buffer
       if (inchar == *in_string)
 	*in_string= 0;
-      else if (!*ml_comment)
-      {
-	if (!*in_string && (inchar == '\'' || inchar == '"' || inchar == '`'))
+      else if (!*ml_comment && !*in_string &&
+	       (inchar == '\'' || inchar == '"' || inchar == '`'))
 	*in_string= (char) inchar;
+      if (!*ml_comment)
 	*out++= (char) inchar;
     }
   }
-  }
   if (out != line || !buffer.is_empty())
   {
     *out++='\n';