into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged