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.h | |
| parent | 6ac0363426f96c26c64447f0aa7fbd8a13ecc313 (diff) | |
| parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
| download | mariadb-git-27ab01243cbc7ddba29704afe31d0812652be19b.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 70c97613f55..e08d1b20bef 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1427,6 +1427,12 @@ public: */ BINLOG_STMT_UNSAFE_UPDATE_IGNORE, + /** + INSERT... ON DUPLICATE KEY UPDATE on a table with more than one + UNIQUE KEYS is unsafe. + */ + BINLOG_STMT_UNSAFE_INSERT_TWO_KEYS, + /* The last element of this enumeration type. */ BINLOG_STMT_UNSAFE_COUNT }; |