diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 4120342c2c5..30f1e88b86c 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1711,6 +1711,8 @@ bool Log_event::write_header(ulong event_data_length) */ log_pos= writer->pos() + data_written; + + DBUG_EXECUTE_IF("dbug_master_binlog_over_2GB", log_pos += (1ULL <<31);); } now= get_time(); // Query start time diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 78034badf8c..4ec70bf31da 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1904,11 +1904,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; } |