summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_loaddata.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
commit1f280ec435def1424da70b266b2fd5a6c79ac8b8 (patch)
tree26f9ccd82dfb14b17cef7056e2e93c8774b81bf6 /mysql-test/r/rpl_loaddata.result
parent1ea162d84fe5094c2f619b725279742cc1e7368e (diff)
downloadmariadb-git-1f280ec435def1424da70b266b2fd5a6c79ac8b8.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_loaddata.result')
-rw-r--r--mysql-test/r/rpl_loaddata.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
index b42f78f01bd..e93f8487c32 100644
--- a/mysql-test/r/rpl_loaddata.result
+++ b/mysql-test/r/rpl_loaddata.result
@@ -22,7 +22,7 @@ day id category name
2003-04-22 2416 a bbbbb
show binlog events from 898;
Log_name Pos Event_type Server_id Orig_log_pos Info
-slave-bin.001 898 Query 1 895 use test; insert into t3 select * from t2
+slave-bin.001 898 Query 1 898 use test; insert into t3 select * from t2
drop table t1;
drop table t2;
drop table t3;