mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1 mysql-test/suite/binlog/r/binlog_killed.result: Auto merged mysql-test/suite/binlog/t/binlog_killed.test: Auto merged mysql-test/suite/rpl/t/rpl_dual_pos_advance.test: Auto merged mysql-test/suite/rpl/t/rpl_temporary.test: manual merge sql/log.cc: manual merge
This commit is contained in:
@ -106,9 +106,3 @@ connection slave;
|
||||
sync_with_master;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
||||
# Cleanup
|
||||
# The A->B->A replication causes the master to start writing relay logs
|
||||
# in var/run, remove them
|
||||
remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.000001;
|
||||
remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.index;
|
||||
|
@ -208,8 +208,9 @@ select * from t1;
|
||||
|
||||
connection master;
|
||||
drop table t1;
|
||||
--remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql
|
||||
|
||||
# Delete the anonymous users
|
||||
source include/delete_anonymous_users.inc;
|
||||
|
||||
# End of 5.1 tests
|
||||
# End of tests
|
||||
|
Reference in New Issue
Block a user