summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-21 15:30:25 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-21 15:30:25 +0200
commit431e042b5d76ed5fd219c39db798c9e7478731c8 (patch)
treea5556e1a39e43ca6a9549ef949541efcd9725f40 /sql/share
parent3f4ef5928e72faf2b7fd0c98c8705ac649d2faf9 (diff)
parent83d455be90a06e8fc1293a611061bd9529ed8536 (diff)
downloadmariadb-git-431e042b5d76ed5fd219c39db798c9e7478731c8.tar.gz
c
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 8510eb1f1ac..140220dfa9c 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6492,6 +6492,15 @@ 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."
+
+ER_UNUSED_1
+ eng "You should never see it"
+
#
# End of 5.5 error messages.
#