into deer.(none):/home/hf/work/mysql-5.0.errmsg


mysql-test/r/row.result:
  Auto merged
sql/item.cc:
  Auto merged