mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse source 
into mysql.com:/home/mysql_src/mysql-4.0
This commit is contained in:
guilhem@mysql.com 2004-05-05 21:51:26 +02:00
commit f7f7e725d6
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/rpl_server_id2.result
View file

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

4
mysql-test/t/rpl_server_id2.test
View file

@ -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;

6
sql/slave.cc
View file

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