mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.5 merge

Browse source
This commit is contained in:
Sergei Golubchik 2014-02-25 16:04:35 +01:00
commit 0b9a0a3517
1431 changed files with 5962 additions and 2175 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sql/sql_plugin.cc
View file

@ -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
@ -1341,6 +1341,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))