diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 10:47:52 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 12:19:59 +0200 |
| commit | d2f1c3ed6ccf823babf311970dfa0b7c57850db7 (patch) | |
| tree | 7c3db13f204c0a0c08f48ddaa402e64a2e209192 /sql/log_event_server.cc | |
| parent | 212994f704496d01881f377e34e04bd007e5e298 (diff) | |
| parent | af143474d8925cdbcfc0795a2bc274cbeaad8889 (diff) | |
| download | mariadb-git-d2f1c3ed6ccf823babf311970dfa0b7c57850db7.tar.gz | |
Merge branch '10.5' into bb-10.6-release
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 882dbcfc6a5..2cae9f60e4e 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -1728,7 +1728,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 |