bk commit into 4.1 tree (bar:1.2459) BUG#13487

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2459 05/09/28 15:46:09 bar@stripped +1 -0
    Bug#13487 Japanese data inside a comment causes the syntax error
  mysql.cc:
    Fixed not to copy multibyte characters to the
    target string if we are inside a comment.

  client/mysql.cc
    1.213 05/09/28 15:44:34 bar@stripped +11 -5
    Bug#13487 Japanese data inside a comment causes the syntax error
    Fixed not to copy multibyte characters to the
    target string if we are inside a comment.
    ,

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1.b13487

--- 1.212/client/mysql.cc	2005-09-25 23:22:20 +05:00
+++ 1.213/client/mysql.cc	2005-09-28 15:44:34 +05:00
@@ -1157,11 +1157,17 @@
 #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 == '\\')