- Please rebase on the current 5.5 to 5.6 GCA. It will include at
least one more upstream merge, which always touches replication
and its testsuite. Perhaps that will resolve the rpl_stop_slave
conflicts too.
- suite/rpl/t/rpl_drop_temp.test should be bzr mv'ed to
extra/rpl_tests/rpl_drop_temp.test and
suite/rpl/t/rpl_stm_drop_temp.test should bzr add'ed. This will
give a smaller diff, and the upstream merges will cause
conflicts or automerge at the right place.
- Likewise for rpl_rewrt_db.
- In rpl_mixed_drop_create_temp_table, diff lines 1792+ ("B N
N-Temp T-SELECT-N-Temp N-Temp C"), it seems that binlog is
missing the row events for INSERT INTO nt_xx_1 SELECT * FROM
tt_tmp_xx_1;
- Add a comment to the end of rpl_stop_slave "bug 58546 part was
moved to ... " to help with future merges.
- Please rebase on the current 5.5 to 5.6 GCA. It will include at
least one more upstream merge, which always touches replication
and its testsuite. Perhaps that will resolve the rpl_stop_slave
conflicts too.
- suite/rpl/ t/rpl_drop_ temp.test should be bzr mv'ed to rpl_tests/ rpl_drop_ temp.test and rpl/t/rpl_ stm_drop_ temp.test should bzr add'ed. This will
extra/
suite/
give a smaller diff, and the upstream merges will cause
conflicts or automerge at the right place.
- Likewise for rpl_rewrt_db.
- In rpl_mixed_ drop_create_ temp_table, diff lines 1792+ ("B N
N-Temp T-SELECT-N-Temp N-Temp C"), it seems that binlog is
missing the row events for INSERT INTO nt_xx_1 SELECT * FROM
tt_tmp_xx_1;
- Add a comment to the end of rpl_stop_slave "bug 58546 part was
moved to ... " to help with future merges.
- There is a couple of diff comments.