Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/symlink.result:
  use local.
mysql-test/t/symlink.test:
  use local
sql/mysql_priv.h:
  use local
sql/mysqld.cc:
  use local
sql/sql_parse.cc:
  use local