diff options
| author | unknown <sven@riska.(none)> | 2008-04-02 16:49:22 +0700 |
|---|---|---|
| committer | unknown <sven@riska.(none)> | 2008-04-02 16:49:22 +0700 |
| commit | edb7733c8315f28325594a107d65aee88a251383 (patch) | |
| tree | b16cbca42a549a7b5566a7f173d496e40a000f39 /sql | |
| parent | fdb9d02945e4e867bc3e862e41b9f2a5522ba76c (diff) | |
| download | mariadb-git-edb7733c8315f28325594a107d65aee88a251383.tar.gz | |
BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode
Problem: a typo in the code. When autocommit, foreign_key_checks,
sql_auto_is_null, or unique_checks changes, it prints "SET", and then a
comma-separated list of assignments. However, it does not print the
assignment to the @@autocommit variable.
Fix: print the @@autocommit variable.
mysql-test/r/mysqlbinlog.result:
Updated result file since output of mysqlbinlog changed.
mysql-test/r/mysqlbinlog2.result:
Updated result file since output of mysqlbinlog changed.
mysql-test/r/user_var-binlog.result:
Updated result file since output of mysqlbinlog changed.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
Updated result file since output of mysqlbinlog changed.
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
Updated result file since output of mysqlbinlog changed.
mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
Updated result file since output of mysqlbinlog changed.
sql/log_event.cc:
Just a typo: mysqlbinlog should print the autocommit flag
when the value of the flag changes.
Also fixed nearby indentation.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 15f1a957149..ff553760831 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2142,11 +2142,13 @@ void Query_log_event::print_query_header(IO_CACHE* file, bool need_comma= 0; my_b_printf(file, "SET "); print_set_option(file, tmp, OPTION_NO_FOREIGN_KEY_CHECKS, ~flags2, - "@@session.foreign_key_checks", &need_comma); + "@@session.foreign_key_checks", &need_comma); print_set_option(file, tmp, OPTION_AUTO_IS_NULL, flags2, - "@@session.sql_auto_is_null", &need_comma); + "@@session.sql_auto_is_null", &need_comma); print_set_option(file, tmp, OPTION_RELAXED_UNIQUE_CHECKS, ~flags2, - "@@session.unique_checks", &need_comma); + "@@session.unique_checks", &need_comma); + print_set_option(file, tmp, OPTION_NOT_AUTOCOMMIT, ~flags2, + "@@session.autocommit", &need_comma); my_b_printf(file,"%s\n", print_event_info->delimiter); print_event_info->flags2= flags2; } |