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


sql/ha_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged