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


mysql-test/r/partition.result:
  Auto merged
sql/share/errmsg.txt:
  Auto merged