diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-04-10 14:23:17 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-04-10 14:23:17 +0300 |
| commit | 7fa28bcf568f6873346a4c222bb95a60556876e9 (patch) | |
| tree | 2238a3d5fa70dcbe2a1e176ceef8ce7394842463 /sql/share | |
| parent | 1d860ec51a3414259d349efba3dec68c295c79a2 (diff) | |
| parent | 20459a71e3e0d5d6607bde122f27f752de053dd4 (diff) | |
| download | mariadb-git-7fa28bcf568f6873346a4c222bb95a60556876e9.tar.gz | |
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 3459c2041e3..1917ec2d5a1 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6494,6 +6494,9 @@ ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC eng "CREATE TABLE... SELECT... on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave." +ER_BINLOG_UNSAFE_INSERT_TWO_KEYS + eng "INSERT... ON DUPLICATE KEY UPDATE on a table with more than one UNIQUE KEY is unsafe" + ER_TABLE_IN_FK_CHECK eng "Table is being used in foreign key check." |