database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge from maria/5.5 (-rtag:mariadb-5.5.36).

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-02-25 17:49:41 -05:00
parent e36fe045c0 ff2e82f4a1
commit ae6e1548cb
1431 changed files with 6096 additions and 2196 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
@@ -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))