diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 15:07:15 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 15:07:15 +0300 |
| commit | 665ef203683eb80fc925d1da27fbcbd5fe314859 (patch) | |
| tree | acbdc8415cbba55527d849790c836f70d5df21dc /sql/sql_lex.cc | |
| parent | 27f60d57d893c47d61c4ceb55694e8c569292b35 (diff) | |
| parent | 9de021c753566259c0e0b2923c6b149a2d1e8734 (diff) | |
| download | mariadb-git-665ef203683eb80fc925d1da27fbcbd5fe314859.tar.gz | |
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index f22f459e93e..869a5916339 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -59,6 +59,12 @@ Query_tables_list::binlog_stmt_unsafe_errcode[BINLOG_STMT_UNSAFE_COUNT] = ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS, ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE, ER_BINLOG_UNSAFE_MIXED_STATEMENT, + ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT, + ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE, + ER_BINLOG_UNSAFE_REPLACE_SELECT, + ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT, + ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT, + ER_BINLOG_UNSAFE_UPDATE_IGNORE }; @@ -435,6 +441,7 @@ void lex_start(THD *thd) lex->is_lex_started= TRUE; lex->used_tables= 0; + lex->reset_slave_info.all= false; DBUG_VOID_RETURN; } |