mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/table.cc:
  Merge warning of multi-byte charset being applied
  to table of unknown charset.