into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged