summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2004-05-05 21:50:51 +0200
committerguilhem@mysql.com <>2004-05-05 21:50:51 +0200
commitd20230bcbe59dd19b14b1c5a529c326ae3182543 (patch)
treeb1841cd19b1e4f007186f9cca7caff6ccd4404f0 /sql/slave.cc
parent5fcd62a13a1923f7d4b6e7df2645e2f39d6473ac (diff)
downloadmariadb-git-d20230bcbe59dd19b14b1c5a529c326ae3182543.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
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc6
1 files changed, 3 insertions, 3 deletions
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))