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

into mysql.com:/usr/home/bar/mysql-4.1 client/mysql.cc: Auto merged

Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
into mysql.com:/usr/home/bar/mysql-4.1 client/mysql.cc: Auto merged
08bf55c7 · unknown · 05414133 · 1bdd8a62 · 08bf55c7
Commit 08bf55c7 authored Oct 14, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

client/mysql.cc client/mysql.cc +11 -5

No files found.
--- 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))) {
+        (l= my_ismbchar(charset_info, pos, strend)))
-	while (l--)
+    {
-	    *out++ = *pos++;
+      if (!*ml_comment)
-	pos--;
+      {
-	continue;
+        while (l--)
+          *out++ = *pos++;
+        pos--;
+      }
+      else
+        pos+= l - 1;
+      continue;
    }
 #endif
    if (!*ml_comment && inchar == '\\')