into  mysql.com:/home/jimw/my/mysql-5.0-clean


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