bk commit into 4.1 tree (konstantin:1.2181)

[konstantin]

Below is the list of changes that have just been committed into a local
4.1 repository of kostja. When kostja 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2181 05/01/14 01:59:03 konstantin@stripped +1 -0
  fix C++ comments in C file (fixed in 5.0 already)

  strings/ctype-uca.c
    1.28 05/01/14 01:58:53 konstantin@stripped +2 -2
    fix C++ comments in C file

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/home/kostja/work/mysql-4.1-root

--- 1.27/strings/ctype-uca.c	2005-01-13 17:11:56 +03:00
+++ 1.28/strings/ctype-uca.c	2005-01-14 01:58:53 +03:00
@@ -7214,7 +7214,7 @@
                            uchar *dst, uint dstlen,
                            const uchar *src, uint srclen)
 {
-  uchar *de = dst + (dstlen & (uint) ~1); // add even length for easier code
+  uchar *de = dst + (dstlen & (uint) ~1); /* add even length for easier code */
   int   s_res;
   my_uca_scanner scanner;
   scanner_handler->init(&scanner, cs, src, srclen);
@@ -7232,7 +7232,7 @@
     dst[1]= s_res & 0xFF;
     dst+= 2;
   }
-  if (dstlen & 1) // if odd number then fill the last char
+  if (dstlen & 1) /* if odd number then fill the last char */
     *dst= '\0';
   
   return dstlen;