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


mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  needs no change in 5.1 as it is in a separate folder
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  needs regeneration
mysql-test/t/mysqlbinlog-cp932.test:
  needs no change because already has dependency on binlog format
mysql-test/t/mysqlbinlog2.test:
  needs no change because already has dependency on binlog format