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


sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  manual merge