very minor changes: a STOP SLAVE in a replication test to get rid of a non...

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

@@ -18,4 +18,5 @@ select * from t1;
 n
 1
 1
+stop slave;
 drop table t1;

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;

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))