diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-04-02 12:36:38 +0200 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-04-02 12:36:38 +0200 |
| commit | 49134a7ed99c3e16815c723d8c60361a82dfe315 (patch) | |
| tree | 13a6524ed84b7e8e3fe11647d4512634a2d280c4 /sql | |
| parent | c481f6b3cf80f471321d2ef4e7c68fe9e6e5d0ca (diff) | |
| parent | edb7733c8315f28325594a107d65aee88a251383 (diff) | |
| download | mariadb-git-49134a7ed99c3e16815c723d8c60361a82dfe315.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
mysql-test/suite/binlog/r/binlog_base64_flag.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
Auto merged
sql/log_event.cc:
Auto merged
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 6b0e19f27cb..35cffbbf38c 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2143,11 +2143,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; } |