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_insert_delayed.test

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl

2007-03-29 21:38:03 +02:00

binlog.test

Manual merge of Bug 33798

2008-02-08 10:47:25 -02:00

blackhole.test

Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl

2008-03-29 15:00:12 +02:00

ctype_cp932_binlog.test

Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369

2007-06-07 19:19:29 +02:00

ctype_cp932.test

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

2008-02-20 19:49:26 +01:00

ctype_ucs_binlog.test

Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369

2007-06-07 19:19:29 +02:00

database.test

Bug#32435:

2007-11-16 15:55:22 +01:00

drop_temp_table.test

Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50

2007-06-15 18:56:11 +02:00

innodb_stat.test

bug #19650 (Embedded crashes in 5.1.10)

2006-05-24 13:28:24 +05:00

insert_select-binlog.test

Merge bk-internal:/home/bk/mysql-5.1-new-maint

2007-06-07 15:21:52 -07:00

mix_innodb_myisam_binlog.test

Fix pushbuild errors.

2008-02-27 15:18:27 +01:00

mix_innodb_myisam_side_effects.test

fix failed tests

2008-01-21 22:31:31 +08:00