summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-18 19:04:23 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-18 19:04:23 +0100
commitd41d43f42165cafe87d361f473e226fee24e91ba (patch)
tree20afb41b68fe7982e4500aa9427401fca3ff2fa7 /sql/sql_plugin.cc
parent5649377b558d182a4856a86157070e0df93097a7 (diff)
downloadmariadb-git-d41d43f42165cafe87d361f473e226fee24e91ba.tar.gz
MDEV-4065 thd_kill_statement service
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index cec577b2273..bf3537c0ed9 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1872,8 +1872,11 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
DBUG_RETURN(FALSE);
error:
mysql_mutex_unlock(&LOCK_plugin);
- sql_print_error("Couldn't load plugin named '%s' with soname '%s'.",
- name.str, dl.str);
+ if (name.str)
+ sql_print_error("Couldn't load plugin '%s' from '%s'.",
+ name.str, dl.str);
+ else
+ sql_print_error("Couldn't load plugins from '%s'.", dl.str);
DBUG_RETURN(TRUE);
}