2674 Sven Sandberg 2008-08-06 [merge]
merged 5.1 main -> 5.1-rpl-testfixes
all files automerged without conflict
modified:
mysql-test/extra/binlog_tests/binlog_insert_delayed.test
mysql-test/include/show_binlog_events.inc
mysql-test/suite/binlog/r/binlog_killed_simulate.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/rpl/r/rpl_loaddata_map.result
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/r/rpl_variables.result
mysql-test/suite/rpl/t/rpl_incident.test
mysql-test/suite/rpl/t/rpl_loaddata_map.test
mysql-test/suite/rpl/t/rpl_trunc_temp.test
mysql-test/suite/rpl/t/rpl_variables.test
| Thread |
|---|
| • bzr push into mysql-5.1 branch (sven:2674) Bug#37493 Bug#38068 Bug#38077Bug#38170 Bug#38178 | Sven Sandberg | 6 Aug |