database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge with mysql-5.5.21

Browse Source
This commit is contained in:
Sergei Golubchik
2012-03-09 08:06:59 +01:00
parent 97ee59d27d 7009bf411a
commit 4933d21e5d
127 changed files with 3500 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_udf.cc
View File

@@ -228,6 +228,7 @@ void udf_init()
char dlpath[FN_REFLEN];
strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", tmp->dl,
NullS);
(void) unpack_filename(dlpath, dlpath);
if (!(dl= dlopen(dlpath, RTLD_NOW)))
{
/* Print warning to log */
@@ -476,6 +477,8 @@ int mysql_create_function(THD *thd,udf_func *udf)
{
char dlpath[FN_REFLEN];
strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", udf->dl, NullS);
(void) unpack_filename(dlpath, dlpath);
if (!(dl = dlopen(dlpath, RTLD_NOW)))
{
DBUG_PRINT("error",("dlopen of %s failed, error: %d (%s)",