diff options
| author | unknown <guilhem@mysql.com> | 2005-10-13 00:29:23 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-10-13 00:29:23 +0200 |
| commit | 16f3cb039416fff8551c77c1f28c6439a762c66c (patch) | |
| tree | 8c0b8caee1dd85a54979d11df0c0c8d57037a003 /sql/slave.cc | |
| parent | bec380588e9b4ca0db056d91d352c25a5dc9aa77 (diff) | |
| download | mariadb-git-16f3cb039416fff8551c77c1f28c6439a762c66c.tar.gz | |
fixes after merge of 4.1.
mysql-test/r/subselect.result:
correcting non-ascii chars hosed by automerge as usual
mysql-test/t/subselect.test:
correcting non-ascii chars hosed by automerge as usual
sql/log_event.cc:
correcting bad manual merge. ZERO_LEN is not needed in 5.0, as ::exec_event() just tell()s the relay log instead
of using get_event_len().
sql/log_event.h:
get_event_len() is not needed in 5.0, ZERO_LEN neither.
sql/slave.cc:
fixes to take into account 5.0 specificities in replication. ZERO_LEN is not needed.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index cb52abc68b3..15a70b788e6 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4438,10 +4438,12 @@ int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len) if (buf[EVENT_TYPE_OFFSET]!=FORMAT_DESCRIPTION_EVENT && buf[EVENT_TYPE_OFFSET]!=ROTATE_EVENT && buf[EVENT_TYPE_OFFSET]!=STOP_EVENT) + { mi->master_log_pos+= inc_pos; - memcpy(rli->ign_master_log_name_end, mi->master_log_name, FN_REFLEN); - DBUG_ASSERT(rli->ign_master_log_name_end[0]); - rli->ign_master_log_pos_end= mi->master_log_pos; + memcpy(rli->ign_master_log_name_end, mi->master_log_name, FN_REFLEN); + DBUG_ASSERT(rli->ign_master_log_name_end[0]); + rli->ign_master_log_pos_end= mi->master_log_pos; + } rli->relay_log.signal_update(); // the slave SQL thread needs to re-check DBUG_PRINT("info", ("master_log_pos: %d, event originating from the same server, ignored", (ulong) mi->master_log_pos)); } @@ -4850,8 +4852,7 @@ Log_event* next_event(RELAY_LOG_INFO* rli) DBUG_PRINT("info",("seeing an ignored end segment")); ev= new Rotate_log_event(thd, rli->ign_master_log_name_end, 0, rli->ign_master_log_pos_end, - Rotate_log_event::DUP_NAME | - Rotate_log_event::ZERO_LEN); + Rotate_log_event::DUP_NAME); rli->ign_master_log_name_end[0]= 0; if (unlikely(!ev)) { |