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


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged