Merge from team tree

This commit is contained in:
Alexey Kopytov 2009-02-13 19:32:23 +03:00
commit 7040781c19
2 changed files with 3 additions and 3 deletions

View file

@ -69,9 +69,9 @@ let $_fake_relay_log_purge= `SELECT @@global.relay_log_purge`;
# Create relay log file.
copy_file $fake_relay_log $_fake_relay_log;
# Create relay log index.
--exec echo $_fake_relay_log > $_fake_relay_index
--exec echo $_fake_filename-fake.000001 > $_fake_relay_index
# Setup replication from existing relay log.
eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_relay_log', RELAY_LOG_POS=4;
eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_filename-fake.000001', RELAY_LOG_POS=4;
--enable_query_log

View file

@ -11,7 +11,7 @@
#
--source include/have_log_bin.inc
--source include/not_windows.inc
#
# Bug#31240 load data infile replication between (4.0 or 4.1) and 5.1 fails
#