into  zim.(none):/home/mikael/bug15961


sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge