diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-08 17:12:32 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-08 17:12:32 +0200 |
| commit | 1d480419822b53c840de54542c1d1a0851dbe2c8 (patch) | |
| tree | 629aabba2d52741b4075c3e345396bd989516cb2 /sql/log_event_client.cc | |
| parent | 3ebbfd88a0360938e3a5a480265beb2a71b1268a (diff) | |
| parent | 4f54c219e7c73072d7eff1e81e0f51dc1ff47509 (diff) | |
| download | mariadb-git-1d480419822b53c840de54542c1d1a0851dbe2c8.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'sql/log_event_client.cc')
| -rw-r--r-- | sql/log_event_client.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/log_event_client.cc b/sql/log_event_client.cc index 7e0bf7d8e4c..b955b7a0f57 100644 --- a/sql/log_event_client.cc +++ b/sql/log_event_client.cc @@ -1886,6 +1886,7 @@ bool Query_log_event::print_query_header(IO_CACHE* file, if (unlikely(tmp)) /* some bits have changed */ { bool need_comma= 0; + ulonglong mask= glob_description_event->options_written_to_bin_log; if (my_b_write_string(file, "SET ") || print_set_option(file, tmp, OPTION_NO_FOREIGN_KEY_CHECKS, ~flags2, "@@session.foreign_key_checks", &need_comma)|| @@ -1895,11 +1896,13 @@ bool Query_log_event::print_query_header(IO_CACHE* file, "@@session.unique_checks", &need_comma) || print_set_option(file, tmp, OPTION_NOT_AUTOCOMMIT, ~flags2, "@@session.autocommit", &need_comma) || - print_set_option(file, tmp, OPTION_NO_CHECK_CONSTRAINT_CHECKS, - ~flags2, + print_set_option(file, tmp, OPTION_NO_CHECK_CONSTRAINT_CHECKS, ~flags2, "@@session.check_constraint_checks", &need_comma) || - print_set_option(file, tmp, OPTION_IF_EXISTS, flags2, - "@@session.sql_if_exists", &need_comma)|| + print_set_option(file, tmp, mask & OPTION_IF_EXISTS, flags2, + "@@session.sql_if_exists", &need_comma) || + print_set_option(file, tmp, mask & OPTION_EXPLICIT_DEF_TIMESTAMP, flags2, + "@@session.explicit_defaults_for_timestamp", + &need_comma) || my_b_printf(file,"%s\n", print_event_info->delimiter)) goto err; print_event_info->flags2= flags2; |