diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-14 12:02:03 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-14 12:02:03 +0100 |
| commit | 79479ee97571e8023b0269ffddbf525d54955273 (patch) | |
| tree | 6297405507fee3aa01617a4f8462cc413d880452 /sql/slave.cc | |
| parent | 8404b44a845e8a827bf1986fe4450673782bfdae (diff) | |
| download | mariadb-git-79479ee97571e8023b0269ffddbf525d54955273.tar.gz | |
After-merge fixes for 5.5 merge.
Fix typo causing too low timeout value for wait_for_slave_param.inc.
Fix binlog checksums following 5.5 merge.
Make sure the rpl suite can run with --mysqld=--binlog-checksum=CRC32
Fix a number of problems in the code when checksums are enabled.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index bd6e9aa69f9..91ddf7bf171 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4274,7 +4274,11 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) HB (heartbeat) cannot come before RL (Relay) */ char llbuf[22]; - Heartbeat_log_event hb(buf, event_len, mi->rli.relay_log.description_event_for_queue); + Heartbeat_log_event hb(buf, + mi->rli.relay_log.relay_log_checksum_alg + != BINLOG_CHECKSUM_ALG_OFF ? + event_len - BINLOG_CHECKSUM_LEN : event_len, + mi->rli.relay_log.description_event_for_queue); if (!hb.is_valid()) { error= ER_SLAVE_HEARTBEAT_FAILURE; |