diff options
| author | kostja@bodhi.local <> | 2006-07-26 23:33:25 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-07-26 23:33:25 +0400 |
| commit | 73189969f358be1530a1421fe38ea5cd183cfe10 (patch) | |
| tree | 9127bb933b3774974a321dce0ca111f0e8ac8991 /sql/sql_udf.cc | |
| parent | bea330494ce2ef65fcdb0c74c646af7df8a0d778 (diff) | |
| parent | bd183d42dcf66432d2e8051e030919a4669eaf8c (diff) | |
| download | mariadb-git-73189969f358be1530a1421fe38ea5cd183cfe10.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index b92a9363a22..13302c2c3f7 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -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 |