Post-push fix. The previous patch did 'reset master' at the wrong place.
mysql-test/include/master-slave-reset.inc:
reset master must be called *after* the tables have been dropped.
The purpose of reset master is to get rid of 'drop table' from
the slave's binlog.
when resetting replication tests. If not, circular replication setups
will leave cruft in the slaves binary log.
mysql-test/include/master-slave-reset.inc:
Adding RESET MASTER on slave and RESET SLAVE on master. In order to avoid
having to re-generate all the replication test result files, I disable the
query log for the added statements.
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
Adding code to clean up after test. Disabling query log for the cleanup code.
mysql-test/include/master-slave-reset.inc:
Adding missing waits for slave to start and stop causing test failures.
mysql-test/suite/rpl/t/rpl_insert.test:
Waiting for the rows to be inserted instead of relying on the binlog position
to be updated correctly.
Switched to writing out table maps for tables that are locked when
the first row in a statement is seen.
mysql-test/include/master-slave.inc:
Moved code to reset master and slave into separate file.
mysql-test/r/binlog_row_blackhole.result:
Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Result change
mysql-test/r/ndb_binlog_ignore_db.result:
Result change
mysql-test/r/rpl_ndb_charset.result:
Result change
mysql-test/r/rpl_row_basic_11bugs.result:
Result change
mysql-test/r/rpl_row_charset.result:
Result change
mysql-test/r/rpl_row_create_table.result:
Result change
mysql-test/t/rpl_row_basic_11bugs.test:
Added test to check that no events are generated when no rows are changed.
mysql-test/t/rpl_row_create_table.test:
Master log position changed
sql/handler.cc:
Adding function write_locked_table_maps() that will write table maps for all
tables locked for write.
Using "table->in_use" instead of "current_thd" since tables are now locked
when the function is called.
Removing old code to write table map.
sql/log_event.cc:
Added assertion
sql/sql_class.cc:
Removing code to write "dummy termination event".
sql/sql_class.h:
Adding getter for binlog_table_maps.
sql/sql_insert.cc:
Setting thd->lock before calling write_record for the execution of
CREATE-SELECT and INSERT-SELECT since they keep multiple locks in the
air at the same time.
mysql-test/include/master-slave-reset.inc:
New BitKeeper file ``mysql-test/include/master-slave-reset.inc''
