into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge


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