diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-11-10 20:32:45 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-11-10 20:32:45 +0100 |
| commit | a1e2d2d14615b0ccac6b1246a58cd347effaeefb (patch) | |
| tree | 0c6bedc8298d6ba68c23420c95626e2b52466499 /sql/sql_plugin.cc | |
| parent | 12ad7f3b9da5e0563c24698856102b4b646cea82 (diff) | |
| parent | 9a0637750a4775e199b3915bd83e630540729d64 (diff) | |
| download | mariadb-git-a1e2d2d14615b0ccac6b1246a58cd347effaeefb.tar.gz | |
Merge main 5.1 -> 5.1-build
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 089ef012d3a..13b2bfef24d 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1715,16 +1715,16 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name) } if (!plugin->plugin_dl) { - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, - "Built-in plugins cannot be deleted,."); + 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); goto err; } plugin->state= PLUGIN_IS_DELETED; if (plugin->ref_count) - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, - "Plugin is busy and will be uninstalled on shutdown"); + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + WARN_PLUGIN_BUSY, ER(WARN_PLUGIN_BUSY)); else reap_needed= true; reap_plugins(); |