into mysql.com:/home/mysql_src/mysql-4.1


mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/set_var.cc:
  Auto merged