diff options
| author | unknown <guilhem@mysql.com> | 2004-05-05 22:01:41 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-05-05 22:01:41 +0200 |
| commit | 974ce66bddf0a1382abb49dfe52a61342e8a80a2 (patch) | |
| tree | 00007fd67d5e86b5600c00f1a2997beceb5a05d8 /sql/slave.cc | |
| parent | 19d3f588f2165ed5025fe0b88c856474b913d6b8 (diff) | |
| download | mariadb-git-974ce66bddf0a1382abb49dfe52a61342e8a80a2.tar.gz | |
Replication:
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
mysql-test/r/rpl_server_id2.result:
result update
sql/slave.cc:
As the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index c8da53433d7..12fec28ec49 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2833,11 +2833,6 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli) log files themselves. */ - /* - 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. - */ if ((ev->server_id == (uint32) ::server_id && !replicate_same_server_id) || (rli->slave_skip_counter && type_code != ROTATE_EVENT)) { @@ -3716,7 +3711,8 @@ int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len) direct master (an unsupported, useless setup!). */ - if (uint4korr(buf + SERVER_ID_OFFSET) == ::server_id) + if ((uint4korr(buf + SERVER_ID_OFFSET) == ::server_id) && + !replicate_same_server_id) { /* Do not write it to the relay log. |