unknown 6630d2e18c Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl ... into mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl BitKeeper/deleted/.del-binlog_killed_simulate.result: Auto merged BitKeeper/deleted/.del-show_binlog_events.inc: Auto merged mysql-test/suite/rpl/r/rpl_user.result: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged BitKeeper/deleted/.del-show_binary_logs.inc: Delete: mysql-test/include/show_binary_logs.inc mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: manual merge ul. mysql-test/extra/binlog_tests/blackhole.test: manual merge mysql-test/suite/binlog/r/binlog_stm_blackhole.result: manual merge sql/log.cc: manual merge sql/share/errmsg.txt: manual merge sql/sql_class.cc: manual merge		2008-03-29 15:00:12 +02:00
..
binlog_tests	Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl	2008-03-29 15:00:12 +02:00
rpl_tests	Post-merge fixes.	2008-03-14 17:52:57 +01:00