mysql-test/r/ctype_ucs.result:
  Fixed warning after merge
sql/field.cc:
  After merge fix
sql/item_cmpfunc.cc:
  Style & comment changes
sql/sql_yacc.yy:
  After merge fix