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

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


client/mysql.cc:
  Auto merged

1 files changed, 11 insertions, 5 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index d82d29a9a54..d408e8a5423 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1157,11 +1157,17 @@ static bool add_line(String &buffer,char *line,char *in_string,
 #ifdef USE_MB
     int l;
     if (use_mb(charset_info) &&
-        (l = my_ismbchar(charset_info, pos, strend))) {
-	while (l--)
-	    *out++ = *pos++;
-	pos--;
-	continue;
+        (l= my_ismbchar(charset_info, pos, strend)))
+    {
+      if (!*ml_comment)
+      {
+        while (l--)
+          *out++ = *pos++;
+        pos--;
+      }
+      else
+        pos+= l - 1;
+      continue;
     }
 #endif
     if (!*ml_comment && inchar == '\\')