summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-04-12 14:04:12 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-04-12 14:04:12 +0300
commita84ca722247a2aa118c42d8c55d80196660d6795 (patch)
tree670cea5ced9a811e020dff96778fa05250fc9e39 /sql/share
parent12421762616f217a98002df50538c46f6966b4d9 (diff)
parent64e74d484fcbf6d348397b3ce4f32438754dc8bd (diff)
downloadmariadb-git-a84ca722247a2aa118c42d8c55d80196660d6795.tar.gz
merge mysql-5.5->mysql-5.5-security
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 1917ec2d5a1..98d33d73d44 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6500,6 +6500,9 @@ ER_BINLOG_UNSAFE_INSERT_TWO_KEYS
ER_TABLE_IN_FK_CHECK
eng "Table is being used in foreign key check."
+ER_UNSUPPORTED_ENGINE
+ eng "Storage engine '%s' does not support system tables. [%s.%s]"
+
#
# End of 5.5 error messages.
#