unknown 157bb46fe2 Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines ...

into  mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.1-engines


storage/blackhole/ha_blackhole.h:
  Use local.
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge.
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge.

2007-05-10 20:01:58 +05: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

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

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

blackhole.test

Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines

2007-05-10 20:01:58 +05:00

ctype_cp932_binlog.test

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

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

ctype_cp932.test

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

2007-03-07 07:21:24 +01:00

ctype_ucs_binlog.test

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

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

drop_temp_table.test

- Fixing binary log positions

2007-03-30 10:27:08 +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

- Fixing binary log positions

2007-03-30 10:27:08 +02:00

mix_innodb_myisam_binlog.test

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

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