summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_log.result
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-08-21 00:23:39 +0200
committerunknown <guilhem@mysql.com>2003-08-21 00:23:39 +0200
commiteb1fb90006fe4daa09d7d1ac5bb39a282a2427a5 (patch)
tree26f9ccd82dfb14b17cef7056e2e93c8774b81bf6 /mysql-test/r/rpl_log.result
parentd52145da3dbdd2458e1591ee7e813154f33e2822 (diff)
downloadmariadb-git-eb1fb90006fe4daa09d7d1ac5bb39a282a2427a5.tar.gz
Result updates after Dmitri's and my changes to logging with --log-slave-updates.
Since my changes, rpl_log.test, whose result file depends on file_id, became non-repeatable, i.e. file_id on slave in SHOW BINLOG EVENTS changed depending on the order of tests (sometimes 1, sometimes 5). Which is logical: as now the slave does not copy Create_file and Exec_load from the relay log (i.e from the master's binlog) to the slave's binlog, but instead lets mysql_load() do the logging, the file_id is now the one whic was used on the slave. Before it was the one which was used on the master, and by chance the master was always restarted for this test because there's a -master.opt file, so file_id on the master is always 1. But now file_id is from the slave so we need to restart the slave. That's why I add an (empty) -slave.opt file. I could have used 'server_stop/start slave', but this would have required the manager, so most of the time mysql-test-run silently skip the test which makes it useless. And I want this test to be run ! mysql-test/r/rpl_loaddata.result: Orig_log_pos is like Pos since Dmitri's good change for BUG#1086 mysql-test/r/rpl_log.result: Orig_log_pos is like Pos now, because Exec_load events are not directly copied by the slave from the relay log to the slave's binary log (these events are written by mysql_load() now). mysql-test/t/rpl_log.test: A comment
Diffstat (limited to 'mysql-test/r/rpl_log.result')
-rw-r--r--mysql-test/r/rpl_log.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index fbec0542e4b..26e465f9c3b 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -84,7 +84,7 @@ slave-bin.001 200 Query 1 200 use test; insert into t1 values (NULL)
slave-bin.001 263 Query 1 263 use test; drop table t1
slave-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null)
slave-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581
-slave-bin.001 1065 Exec_load 1 1056 ;file_id=1
+slave-bin.001 1065 Exec_load 1 1065 ;file_id=1
slave-bin.001 1088 Query 1 1088 use test; drop table t1
slave-bin.001 1136 Query 1 1136 use test; create table t5 (a int)
slave-bin.001 1194 Query 1 1194 use test; drop table t5