Fix valgrind warning + post-merge fixes.

sql/ha_innodb.cc:
  Fix valgrind warning.
strings/ctype-uca.c:
  Fix C++ style comments.

1 files changed, 2 insertions, 2 deletions

diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 605dd2cdab0..2353c9397a2 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -7220,7 +7220,7 @@ static int my_strnxfrm_uca(CHARSET_INFO *cs,
                            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);
@@ -7238,7 +7238,7 @@ static int my_strnxfrm_uca(CHARSET_INFO *cs,
     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;