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.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc
index 7a8561051ba..56d1c978ac4 100644
--- a/sql/log_event_server.cc
+++ b/sql/log_event_server.cc
@@ -1713,12 +1713,7 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
thd->slave_expected_error= expected_error;
if (flags2_inited)
{
- /*
- all bits of thd->variables.option_bits which are 1 in
- OPTIONS_WRITTEN_TO_BIN_LOG must take their value from
- flags2.
- */
- ulonglong mask= rli->relay_log.description_event_for_exec->options_written_to_bin_log;
+ ulonglong mask= flags2_inited;
thd->variables.option_bits= (flags2 & mask) |
(thd->variables.option_bits & ~mask);
}