into  mysql.com:/home/hf/work/mysql-5.1-mrg


sql/sql_partition.cc:
  Auto merged