into  dator5.(none):/home/pappa/bug19309


sql/sql_table.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge