diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-04-19 12:05:07 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-04-19 12:05:07 +0100 |
| commit | 2b89bd9f5e1b61af9683d0fc11a6171ac7748c35 (patch) | |
| tree | 385883e7705d799975869c1605764b28d9acd067 /sql/sql_lex.cc | |
| parent | 61aae51180645fbd0129c913501e0566ece9883a (diff) | |
| parent | e0328736bfc3bcb69699551d80afa931016b6c6b (diff) | |
| download | mariadb-git-2b89bd9f5e1b61af9683d0fc11a6171ac7748c35.tar.gz | |
auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 6384aa575fe..13f85b24299 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -56,7 +56,9 @@ Query_tables_list::binlog_stmt_unsafe_errcode[BINLOG_STMT_UNSAFE_COUNT] = ER_BINLOG_UNSAFE_UDF, ER_BINLOG_UNSAFE_SYSTEM_VARIABLE, ER_BINLOG_UNSAFE_SYSTEM_FUNCTION, - ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS + ER_BINLOG_UNSAFE_NONTRANS_AFTER_TRANS, + ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE, + ER_BINLOG_UNSAFE_MIXED_STATEMENT, }; |