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


client/mysql.cc:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged