Fix valgrind warning + post-merge fixes.

sql/ha_innodb.cc

@@ -4033,8 +4033,8 @@ ha_innobase::create(
 
 	DBUG_ASSERT(innobase_table != 0);
 
-	if ((thd->lex->create_info.used_fields & HA_CREATE_USED_AUTO) &&
-	   (thd->lex->create_info.auto_increment_value != 0)) {
+	if ((create_info->used_fields & HA_CREATE_USED_AUTO) &&
+	   (create_info->auto_increment_value != 0)) {
 
 		/* Query was ALTER TABLE...AUTO_INCREMENT = x; or 
 		CREATE TABLE ...AUTO_INCREMENT = x; Find out a table
@@ -4043,7 +4043,7 @@ ha_innobase::create(
 		auto increment field if the value is greater than the
 		maximum value in the column. */
 
-		auto_inc_value = thd->lex->create_info.auto_increment_value;
+		auto_inc_value = create_info->auto_increment_value;
 		dict_table_autoinc_initialize(innobase_table, auto_inc_value);
 	}
 

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;