diff options
| author | unknown <guilhem@mysql.com> | 2004-05-05 21:50:51 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-05-05 21:50:51 +0200 |
| commit | 601bdde5ed46117cd65c9cf5f660de29623637a3 (patch) | |
| tree | b1841cd19b1e4f007186f9cca7caff6ccd4404f0 | |
| parent | 40dba5a82f0c52107715f4de6420fd3ba911ed68 (diff) | |
| download | mariadb-git-601bdde5ed46117cd65c9cf5f660de29623637a3.tar.gz | |
very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
and a comment update
mysql-test/r/rpl_server_id2.result:
result update
mysql-test/t/rpl_server_id2.test:
We stop the slave before cleaning up otherwise we'll get
'drop table t1' executed twice, so an error in the slave.err
(not critical).
sql/slave.cc:
update comment about 4.1 now that 4.1 is fixed (in a few minutes, exactly)
| -rw-r--r-- | mysql-test/r/rpl_server_id2.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_server_id2.test | 4 | ||||
| -rw-r--r-- | sql/slave.cc | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result index 5f4ec9df4c4..d665bb25dbb 100644 --- a/mysql-test/r/rpl_server_id2.result +++ b/mysql-test/r/rpl_server_id2.result @@ -18,4 +18,5 @@ select * from t1; n 1 1 +stop slave; drop table t1; diff --git a/mysql-test/t/rpl_server_id2.test b/mysql-test/t/rpl_server_id2.test index f022ab13188..dc8f733b7ed 100644 --- a/mysql-test/t/rpl_server_id2.test +++ b/mysql-test/t/rpl_server_id2.test @@ -18,4 +18,8 @@ insert into t1 values (1); save_master_pos; sync_with_master; select * from t1; # check that indeed 2 were inserted +# We stop the slave before cleaning up otherwise we'll get +# 'drop table t1' executed twice, so an error in the slave.err +# (not critical). +stop slave; drop table t1; diff --git a/sql/slave.cc b/sql/slave.cc index c3cbcbab7b2..d6d0a5b5425 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2366,9 +2366,9 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) */ /* - TODO: when this is merged into 4.1, one needs to update queue_event() to - add a similar test for replicate_same_server_id, because in 4.1 the I/O - thread is also filtering events based on the server id. + In 4.1, we updated queue_event() to add a similar test for + replicate_same_server_id, because in 4.1 the I/O thread is also filtering + events based on the server id. */ if ((ev->server_id == (uint32) ::server_id && !replicate_same_server_id) || (rli->slave_skip_counter && type_code != ROTATE_EVENT)) |