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


mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_range.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/partition_range.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/partition_error.result:
  SCCS merged
mysql-test/t/partition_error.test:
  e
  C
  quit
  exit