into  mysql.com:/usr/home/bar/mysql-5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  after merge fix