into  mikael-ronstr-ms-dator.local:/Users/mikron/bug17127


sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  Manual merge
mysql-test/t/partition.test:
  Manual merge