into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


sql/ha_partition.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged