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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged