into mysql.com:/home/hf/work/mysql-5.1.mrg


mysql-test/mysql-test-run.pl:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged