summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorDaniel Fischer <daniel.fischer@oracle.com>2011-09-21 12:40:41 +0200
committerDaniel Fischer <daniel.fischer@oracle.com>2011-09-21 12:40:41 +0200
commit7450044eb77157275241d40623865e102b577977 (patch)
treeb2ce22644a29502769b8202db0ab2e8f3b5ecea6 /sql/share
parentd27d267ee73e9d307e80d4bf91aefcf746b502f7 (diff)
parent8433c8ce61956fdeea45a55c7262bf509aaefb0d (diff)
downloadmariadb-git-7450044eb77157275241d40623865e102b577977.tar.gz
merge from 5.5.16
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 58dea797dda..c04106025a7 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6420,3 +6420,9 @@ ER_INDEX_CORRUPT
ER_UNDO_RECORD_TOO_BIG
eng "Undo log record is too big."
+
+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."