diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 16:34:31 +0300 |
| commit | 4222b2520bdea2be41b50b888f930a63f5af8991 (patch) | |
| tree | 02fcc81139a9a099f0d07c25d03e8b3f40f4c6b6 /sql/sql_plugin.cc | |
| parent | 551ad1cf6f80ad1fab35746eee304d733baa9adf (diff) | |
| parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
| download | mariadb-git-4222b2520bdea2be41b50b888f930a63f5af8991.tar.gz | |
Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index e635fdd5dbe..ba009f31851 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -2032,9 +2032,13 @@ static bool finalize_install(THD *thd, TABLE *table, const LEX_STRING *name) ER_CANT_INITIALIZE_UDF, ER(ER_CANT_INITIALIZE_UDF), name->str, "Plugin is disabled"); } + else if (tmp->state != PLUGIN_IS_UNINITIALIZED) + { + /* already installed */ + return 0; + } else { - DBUG_ASSERT(tmp->state == PLUGIN_IS_UNINITIALIZED); if (plugin_initialize(tmp)) { report_error(REPORT_TO_USER, ER_CANT_INITIALIZE_UDF, name->str, @@ -2174,9 +2178,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) |