summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorMats Kindahl <mats.kindahl@oracle.com>2011-08-15 20:12:11 +0200
committerMats Kindahl <mats.kindahl@oracle.com>2011-08-15 20:12:11 +0200
commitcf5e5f837a06d29e6806eea3c47192dc6dd483da (patch)
treea54b38fc92199ba1d0a8467adb980856f5effafe /sql/share
parentcfb4a7c2ff93a3a653f84d85e5f4b3df16e4f09a (diff)
downloadmariadb-git-cf5e5f837a06d29e6806eea3c47192dc6dd483da.tar.gz
Merging into mysql-5.5.16-release.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index b8f46f090ab..6f4edac285d 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6415,3 +6415,8 @@ ER_ERROR_IN_TRIGGER_BODY
ER_ERROR_IN_UNKNOWN_TRIGGER_BODY
eng "Unknown trigger has an error in its body: '%-.256s'"
+ER_PLUGIN_NO_UNINSTALL
+ eng "Plugin '%s' is marked as not dynamically uninstallable. You have to stop the server to uninstall it."
+
+ER_PLUGIN_NO_INSTALL
+ eng "Plugin '%s' is marked as not dynamically installable. You have to stop the server to install it."