summaryrefslogtreecommitdiff
path: root/sql/log_event_server.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/log_event_server.cc')
-rw-r--r--sql/log_event_server.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc
index 6969c409ef4..e57c19ba1b9 100644
--- a/sql/log_event_server.cc
+++ b/sql/log_event_server.cc
@@ -1970,7 +1970,9 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
OPTIONS_WRITTEN_TO_BIN_LOG must take their value from
flags2.
*/
- thd->variables.option_bits= flags2|(thd->variables.option_bits & ~OPTIONS_WRITTEN_TO_BIN_LOG);
+ ulonglong mask= rli->relay_log.description_event_for_exec->options_written_to_bin_log;
+ thd->variables.option_bits= (flags2 & mask) |
+ (thd->variables.option_bits & ~mask);
}
/*
else, we are in a 3.23/4.0 binlog; we previously received a