Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged