summaryrefslogtreecommitdiff
path: root/sql/share/errmsg-utf8.txt
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2010-10-07 19:52:34 +0400
committerSergey Vojtovich <svoj@sun.com>2010-10-07 19:52:34 +0400
commit818e848dcf63933effd14b1f5cbc139ffc6e102e (patch)
treea618f6e40b01f1f16bdb49add08819795d0adb87 /sql/share/errmsg-utf8.txt
parenta041d95821e707c1de61587b759ca257df5028cf (diff)
parent19463ba4181938e34386e6da9fd41c2e40946502 (diff)
downloadmariadb-git-818e848dcf63933effd14b1f5cbc139ffc6e102e.tar.gz
Merge WL#5496 and WL#5341 to 5.5-bugteam.
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
-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 c7d016b19ca..74a51fb49b3 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6382,3 +6382,6 @@ ER_GRANT_PLUGIN_USER_EXISTS
ER_TRUNCATE_ILLEGAL_FK 42000
eng "Cannot truncate a table referenced in a foreign key constraint (%.192s)"
+
+ER_PLUGIN_IS_PERMANENT
+ eng "Plugin '%s' is force_plus_permanent and can not be unloaded"