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


sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged