summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-06-14 20:05:31 +0200
committerSergei Golubchik <sergii@pisem.net>2012-06-14 20:05:31 +0200
commit0522307ed1b4aeef16dd94606d0b0f6e974b29a5 (patch)
treeac9829d5d4b0e676c984b931702282c446e604ea /sql/share
parentd2ca6d2e7ff028f6abbab52e36530046b3f84a49 (diff)
parent326b40c9c8160db414288925936449e55f4f3a0a (diff)
downloadmariadb-git-0522307ed1b4aeef16dd94606d0b0f6e974b29a5.tar.gz
mysql-5.5 merge
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 140220dfa9c..923e8e73bc7 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6501,6 +6501,9 @@ ER_TABLE_IN_FK_CHECK
ER_UNUSED_1
eng "You should never see it"
+ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST
+ eng "INSERT into autoincrement field which is not the first part in the composed primary key is unsafe."
+
#
# End of 5.5 error messages.
#