1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lp:705210 - Compiling with BUILD/compile-pentium64-debug fails

Browse Source 
support building with -all-static (no dlopen and dlclose make few
related declarations unused or "statement have no effect") and -Werror
This commit is contained in:
Sergei Golubchik 2011-01-20 13:00:46 +01:00
parent 785517dfe6
commit 7effc175ce
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql-common/client_plugin.c
View File

@ -50,7 +50,8 @@ struct st_client_plugin_int {
static my_bool initialized= 0; static my_bool initialized= 0;
static MEM_ROOT mem_root; static MEM_ROOT mem_root;
static const char *plugin_declarations_sym= "_mysql_client_plugin_declaration_"; static const char *plugin_declarations_sym __attribute__((unused)) =
"_mysql_client_plugin_declaration_";
static uint plugin_version[MYSQL_CLIENT_MAX_PLUGINS]= static uint plugin_version[MYSQL_CLIENT_MAX_PLUGINS]=
{ {
0, /* these two are taken by Connector/C */ 0, /* these two are taken by Connector/C */
@ -180,7 +181,7 @@ err2:
plugin->deinit(); plugin->deinit();
err1: err1:
if (dlhandle) if (dlhandle)
dlclose(dlhandle); (void)dlclose(dlhandle);
set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_CANNOT_LOAD, unknown_sqlstate, set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_CANNOT_LOAD, unknown_sqlstate,
ER(CR_AUTH_PLUGIN_CANNOT_LOAD), plugin->name, ER(CR_AUTH_PLUGIN_CANNOT_LOAD), plugin->name,
errmsg); errmsg);
@ -287,7 +288,7 @@ void mysql_client_plugin_deinit()
if (p->plugin->deinit) if (p->plugin->deinit)
p->plugin->deinit(); p->plugin->deinit();
if (p->dlhandle) if (p->dlhandle)
dlclose(p->dlhandle); (void)dlclose(p->dlhandle);
} }
bzero(&plugin_list, sizeof(plugin_list)); bzero(&plugin_list, sizeof(plugin_list));
@ -365,7 +366,7 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
if (!(sym= dlsym(dlhandle, plugin_declarations_sym))) if (!(sym= dlsym(dlhandle, plugin_declarations_sym)))
{ {
errmsg= "not a plugin"; errmsg= "not a plugin";
dlclose(dlhandle); (void)dlclose(dlhandle);
goto err; goto err;
} }

2
sql/sql_plugin_services.h
View File

@ -36,7 +36,7 @@ static struct thd_alloc_service_st thd_alloc_handler= {
thd_make_lex_string thd_make_lex_string
}; };
static struct st_service_ref list_of_services[]= static struct st_service_ref list_of_services[] __attribute__((unused)) =
{ {
{ "my_snprintf_service", VERSION_my_snprintf, &my_snprintf_handler }, { "my_snprintf_service", VERSION_my_snprintf, &my_snprintf_handler },
{ "thd_alloc_service", VERSION_thd_alloc, &thd_alloc_handler } { "thd_alloc_service", VERSION_thd_alloc, &thd_alloc_handler }