into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/partition.result:
  Resolve conflict
mysql-test/t/partition.test:
  Resolve conflict
sql/ha_partition.cc:
  Resolve conflict