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

after merge fixes

Browse Source
This commit is contained in:
serg@serg.mylan
2005-03-03 23:57:48 +01:00
parent e47d0a0e2d
commit 3de51f273b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_udf.cc
View File

@@ -83,10 +83,10 @@ static char *init_syms(udf_func *tmp, char *nm)
{ {
char *end; char *end;
if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name)))) if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name.str))))
return tmp->name; return tmp->name.str;
end=strmov(nm,tmp->name); end=strmov(nm,tmp->name.str);
if (tmp->type == UDFTYPE_AGGREGATE) if (tmp->type == UDFTYPE_AGGREGATE)
{ {
@@ -193,10 +193,10 @@ void udf_init()
This is done to ensure that only approved dll from the system This is done to ensure that only approved dll from the system
directories are used (to make this even remotely secure). directories are used (to make this even remotely secure).
*/ */
if (strchr(dl_name, '/') || strlen(name) > NAME_LEN) if (strchr(dl_name, '/') || name.length > NAME_LEN)
{ {
sql_print_error("Invalid row in mysql.func table for function '%.64s'", sql_print_error("Invalid row in mysql.func table for function '%.64s'",
name); name.str);
continue; continue;
} }
@@ -204,7 +204,7 @@ void udf_init()
if (!(tmp= add_udf(&name,(Item_result) table->field[1]->val_int(), if (!(tmp= add_udf(&name,(Item_result) table->field[1]->val_int(),
dl_name, udftype))) dl_name, udftype)))
{ {
sql_print_error("Can't alloc memory for udf function: '%.64s'", name); sql_print_error("Can't alloc memory for udf function: '%.64s'", name.str);
continue; continue;
} }
@@ -271,7 +271,7 @@ void udf_free()
{ {
initialized= 0; initialized= 0;
rwlock_destroy(&THR_LOCK_udf); rwlock_destroy(&THR_LOCK_udf);
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }