diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-13 14:14:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-13 14:14:47 +0200 |
| commit | acad1cc03c082abafc11554cfa4f801638521018 (patch) | |
| tree | d5c969dbb2ec9c22371b8482e6f22db3d250d077 /sql | |
| parent | 458927163a88e5e95b5764cf95713509ab386211 (diff) | |
| download | mariadb-git-acad1cc03c082abafc11554cfa4f801638521018.tar.gz | |
MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic plugins
change WARN_PLUGIN_DELETE_BUILTIN to ER_PLUGIN_DELETE_BUILTIN
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 656402f1d04..4162297b33c 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6161,7 +6161,7 @@ WARN_NO_MASTER_INFO WARN_OPTION_IGNORED eng "<%-.64s> option ignored" ger "Option <%-.64s> ignoriert" -WARN_PLUGIN_DELETE_BUILTIN +ER_PLUGIN_DELETE_BUILTIN eng "Built-in plugins cannot be deleted" ger "Eingebaute Plugins können nicht gelöscht werden" WARN_PLUGIN_BUSY diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index f540431b4e9..55047a6da61 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -2174,9 +2174,7 @@ static bool do_uninstall(THD *thd, TABLE *table, const LEX_STRING *name) } if (!plugin->plugin_dl) { - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - WARN_PLUGIN_DELETE_BUILTIN, ER(WARN_PLUGIN_DELETE_BUILTIN)); - my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "PLUGIN", name->str); + my_error(ER_PLUGIN_DELETE_BUILTIN, MYF(0)); return 1; } if (plugin->load_option == PLUGIN_FORCE_PLUS_PERMANENT) |