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

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

1 files changed, 9 insertions, 4 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index 8d5e576ca23..989e2dae3ef 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -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--)
-        *out++ = *pos++;
-      pos--;
+      if (!*ml_comment)
+      {
+        while (lenght--)
+          *out++ = *pos++;
+        pos--;
+      }
+      else
+        pos+= lenght - 1;
       continue;
     }
 #endif