mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 00:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

after merge fixes

Browse source 
Originally contained in 2005/03/03 23:57:48+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/sql_udf.cc:
  after merge fixes
This commit is contained in:
unknown 2005-03-31 21:57:46 +02:00
parent b6a38fc7f7
commit 32220745e0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sql/sql_udf.cc
View file

@ -83,8 +83,8 @@ static char *init_syms(udf_func *tmp, char *nm)
{
char *end;
if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name))))
return tmp->name;
if (!((tmp->func= dlsym(tmp->dlhandle, tmp->name.str))))
return tmp->name.str;
end=strmov(nm,tmp->name.str);
@ -193,17 +193,17 @@ void udf_init()
This is done to ensure that only approved dll from the system
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'",
name);
name.str);
continue;
}
if (!(tmp = add_udf(&name,(Item_result) table->field[1]->val_int(),
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;
}
@ -270,7 +270,7 @@ void udf_free()
{
initialized= 0;
rwlock_destroy(&THR_LOCK_udf);
}
}
DBUG_VOID_RETURN;
}