mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
This commit is contained in:
@ -57,7 +57,7 @@ static char *init_syms(udf_func *tmp, char *nm)
|
||||
{
|
||||
char *end;
|
||||
|
||||
if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name.str))))
|
||||
if (!((tmp->func= (Udf_func_any) dlsym(tmp->dlhandle, tmp->name.str))))
|
||||
return tmp->name.str;
|
||||
|
||||
end=strmov(nm,tmp->name.str);
|
||||
@ -65,18 +65,18 @@ static char *init_syms(udf_func *tmp, char *nm)
|
||||
if (tmp->type == UDFTYPE_AGGREGATE)
|
||||
{
|
||||
(void)strmov(end, "_clear");
|
||||
if (!((tmp->func_clear= dlsym(tmp->dlhandle, nm))))
|
||||
if (!((tmp->func_clear= (Udf_func_clear) dlsym(tmp->dlhandle, nm))))
|
||||
return nm;
|
||||
(void)strmov(end, "_add");
|
||||
if (!((tmp->func_add= dlsym(tmp->dlhandle, nm))))
|
||||
if (!((tmp->func_add= (Udf_func_add) dlsym(tmp->dlhandle, nm))))
|
||||
return nm;
|
||||
}
|
||||
|
||||
(void) strmov(end,"_deinit");
|
||||
tmp->func_deinit= dlsym(tmp->dlhandle, nm);
|
||||
tmp->func_deinit= (Udf_func_deinit) dlsym(tmp->dlhandle, nm);
|
||||
|
||||
(void) strmov(end,"_init");
|
||||
tmp->func_init= dlsym(tmp->dlhandle, nm);
|
||||
tmp->func_init= (Udf_func_init) dlsym(tmp->dlhandle, nm);
|
||||
|
||||
/*
|
||||
to prefent loading "udf" from, e.g. libc.so
|
||||
|
Reference in New Issue
Block a user