into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel


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