diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-25 17:49:41 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-25 17:49:41 -0500 |
| commit | ae6e1548cbda6cb1509f84edb57786c9520a7a6e (patch) | |
| tree | 1e077c56860cfa1149e85117a2a2311d901c0d1c /sql/sql_plugin.cc | |
| parent | e36fe045c03038b3bc2d9d21b4bbce66077985f5 (diff) | |
| parent | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (diff) | |
| download | mariadb-git-ae6e1548cbda6cb1509f84edb57786c9520a7a6e.tar.gz | |
Merge from maria/5.5 (-rtag:mariadb-5.5.36).
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 3df75c72257..17c21118868 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2005, 2012, Oracle and/or its affiliates. - Copyright (c) 2010, 2013, Monty Program Ab + Copyright (c) 2005, 2013, Oracle and/or its affiliates. + Copyright (c) 2010, 2014, SkySQL Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1357,6 +1357,16 @@ static int plugin_initialize(MEM_ROOT *tmp_root, struct st_plugin_int *plugin, goto err; } + if (plugin->plugin_dl && global_system_variables.log_warnings >= 9) + { + void *sym= dlsym(plugin->plugin_dl->handle, + plugin->plugin_dl->mariaversion ? + maria_plugin_declarations_sym : plugin_declarations_sym); + DBUG_ASSERT(sym); + sql_print_information("Plugin %s loaded at %p", + plugin->name.str, sym); + } + if (plugin_type_initialize[plugin->plugin->type]) { if ((*plugin_type_initialize[plugin->plugin->type])(plugin)) |