diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-01-29 12:44:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-01-29 12:44:20 +0400 |
| commit | c7a2f23a7b751cd54dbdcff46a3e7bc1eabe4c02 (patch) | |
| tree | 5f884e1fdf15a1a7d3738b1dff17a91d2c26623f /sql/sql_repl.cc | |
| parent | b4a2baffa82e5c07b96a1c752228560dcac1359b (diff) | |
| parent | b12430adc716be51810953920448563c87fe0521 (diff) | |
| download | mariadb-git-c7a2f23a7b751cd54dbdcff46a3e7bc1eabe4c02.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 7db9f49f25e..e4a39401b04 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1933,11 +1933,8 @@ send_event_to_slave(binlog_send_info *info, Log_event_type event_type, */ if (info->thd->variables.option_bits & OPTION_SKIP_REPLICATION) { - /* - The first byte of the packet is a '\0' to distinguish it from an error - packet. So the actual event starts at offset +1. - */ - uint16 event_flags= uint2korr(&((*packet)[FLAGS_OFFSET+1])); + uint16 event_flags= uint2korr(&((*packet)[FLAGS_OFFSET + ev_offset])); + if (event_flags & LOG_EVENT_SKIP_REPLICATION_F) return NULL; } |