diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-01 13:42:39 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-01 13:42:39 -0700 |
| commit | 27ab01243cbc7ddba29704afe31d0812652be19b (patch) | |
| tree | b50e061d5fe668cc49d270664a67422dd043e9d5 /sql/sql_lex.cc | |
| parent | 6ac0363426f96c26c64447f0aa7fbd8a13ecc313 (diff) | |
| parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
| download | mariadb-git-27ab01243cbc7ddba29704afe31d0812652be19b.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index d7340b67b5a..52e8b00fecf 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -67,7 +67,8 @@ Query_tables_list::binlog_stmt_unsafe_errcode[BINLOG_STMT_UNSAFE_COUNT] = ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT, ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT, ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC, - ER_BINLOG_UNSAFE_UPDATE_IGNORE + ER_BINLOG_UNSAFE_UPDATE_IGNORE, + ER_BINLOG_UNSAFE_INSERT_TWO_KEYS }; |