diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-10-07 19:52:34 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-10-07 19:52:34 +0400 |
| commit | 85d023eb382ad047ee1148d9dc8a24c67134607b (patch) | |
| tree | a618f6e40b01f1f16bdb49add08819795d0adb87 /sql/share | |
| parent | f6e649cfbb5fd8f9e86f5d86844689de4015cc60 (diff) | |
| parent | d9aa82154b02ec2e6bccb0048f9e0c94b6b0af6b (diff) | |
| download | mariadb-git-85d023eb382ad047ee1148d9dc8a24c67134607b.tar.gz | |
Merge WL#5496 and WL#5341 to 5.5-bugteam.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 3 |
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" |