diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
| commit | 4933d21e5d93840ddcf41bf25ed92fbe253ae92d (patch) | |
| tree | a4d892b86aa46927978f82976fff61f1e5193383 /sql/sql_udf.cc | |
| parent | 97ee59d27d3daca806fdb3577df5a0e0a45a0a30 (diff) | |
| parent | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (diff) | |
| download | mariadb-git-4933d21e5d93840ddcf41bf25ed92fbe253ae92d.tar.gz | |
merge with mysql-5.5.21
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index e41598f943c..50c57b62067 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -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)", |