summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorpeter@mysql.com <>2002-09-15 02:17:20 +0400
committerpeter@mysql.com <>2002-09-15 02:17:20 +0400
commitca375370164eabbffc7be5704bad8920b238c7a7 (patch)
tree49f024ff5624bd8aa647e0356ebcb1d8cacfffa4 /mysql-test
parenta8a7fc347b4949c0cc63985659273d6b4c098c83 (diff)
downloadmariadb-git-ca375370164eabbffc7be5704bad8920b238c7a7.tar.gz
Fix MySQL Test so it will not depend on current host in log file naming.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_flush_log_loop.result2
-rw-r--r--mysql-test/t/rpl_flush_log_loop-master.opt2
-rw-r--r--mysql-test/t/rpl_flush_log_loop-slave.opt2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_flush_log_loop.result b/mysql-test/r/rpl_flush_log_loop.result
index 40b4ca72f01..71a714c51d2 100644
--- a/mysql-test/r/rpl_flush_log_loop.result
+++ b/mysql-test/r/rpl_flush_log_loop.result
@@ -14,4 +14,4 @@ slave start;
flush logs;
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
-127.0.0.1 root 9307 60 slave-bin.001 79 mashka-relay-bin.001 119 slave-bin.001 Yes Yes 0 0 79 119
+127.0.0.1 root 9307 60 slave-bin.001 79 relay-log.001 119 slave-bin.001 Yes Yes 0 0 79 119
diff --git a/mysql-test/t/rpl_flush_log_loop-master.opt b/mysql-test/t/rpl_flush_log_loop-master.opt
index eb35347af33..4f6e0f3d00c 100644
--- a/mysql-test/t/rpl_flush_log_loop-master.opt
+++ b/mysql-test/t/rpl_flush_log_loop-master.opt
@@ -1 +1 @@
--O max_binlog_size=1M
+-O max_binlog_size=1M --relay-log=$MYSQL_TEST_DIR/var/master-data/relay-log
diff --git a/mysql-test/t/rpl_flush_log_loop-slave.opt b/mysql-test/t/rpl_flush_log_loop-slave.opt
index eb35347af33..d1373f139b1 100644
--- a/mysql-test/t/rpl_flush_log_loop-slave.opt
+++ b/mysql-test/t/rpl_flush_log_loop-slave.opt
@@ -1 +1 @@
--O max_binlog_size=1M
+-O max_binlog_size=1M --relay-log=$MYSQL_TEST_DIR/var/slave-data/relay-log