diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:47:16 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:47:16 +0200 |
| commit | 4c18f68d59b4b8fbc5793ba48a396b663d1ad12a (patch) | |
| tree | 056967f3594a052d75aefb749456901f5a5a3c40 /sql/log_event_server.cc | |
| parent | 360d99429c97d2bf2e1dc32276e4f3b3f46c9a74 (diff) | |
| parent | 564d37470445c701037e1122aa1a1c2dde8209f8 (diff) | |
| download | mariadb-git-4c18f68d59b4b8fbc5793ba48a396b663d1ad12a.tar.gz | |
Merge branch '10.9' into 10.10
Diffstat (limited to 'sql/log_event_server.cc')
| -rw-r--r-- | sql/log_event_server.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index d5eb944db05..897a8a36c01 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 |