mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
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