diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-10-31 18:07:02 -0400 |
| commit | 4d1511296288782df0e3d9373396724e250b24c1 (patch) | |
| tree | 9fa47d141b71933859d6c2da585e5bb5e52db212 /sql/slave.cc | |
| parent | 17b0b45b1de41a1b188c5de6c3e9d8e6ecc48a72 (diff) | |
| parent | d775ecdd010daad4dc6147fba58acd006bf2c60c (diff) | |
| download | mariadb-git-4d1511296288782df0e3d9373396724e250b24c1.tar.gz | |
Merge tag 'mariadb-10.0.22' into 10.0-galera
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 2db78d2532d..e5bd92bf4fb 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5699,6 +5699,11 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) error_msg.append(llbuf, strlen(llbuf)); goto err; } + + /* + Heartbeat events doesn't count in the binlog size, so we don't have to + increment mi->master_log_pos + */ goto skip_relay_logging; } break; @@ -5928,6 +5933,7 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) else if ((s_id == global_system_variables.server_id && !mi->rli.replicate_same_server_id) || + event_that_should_be_ignored(buf) || /* the following conjunction deals with IGNORE_SERVER_IDS, if set If the master is on the ignore list, execution of |