diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-05 15:50:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-10 18:21:26 +0100 |
| commit | 6cddd12ad6eeea82b1087574e5dd5cb9accd7641 (patch) | |
| tree | 5b3ac96d47d06c4345b19383c12e0c54bcdd2fc6 /sql/sql_udf.cc | |
| parent | 2b1bbac5fa881b8e135dbad3e0ff6b9e2763e24d (diff) | |
| download | mariadb-git-6cddd12ad6eeea82b1087574e5dd5cb9accd7641.tar.gz | |
make sql_udf.cc to shorten dlerror() messages
just as sql_plugin.cc does
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index aa4859b6639..4ccd4948b58 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -227,14 +227,13 @@ void udf_init() if (dl == NULL) { char dlpath[FN_REFLEN]; - strxnmov(dlpath, sizeof(dlpath) - 1, opt_plugin_dir, "/", tmp->dl, - NullS); + 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 */ sql_print_error(ER_THD(new_thd, ER_CANT_OPEN_LIBRARY), - tmp->dl, errno, dlerror()); + tmp->dl, errno, my_dlerror(dlpath)); /* Keep the udf in the hash so that we can remove it later */ continue; } @@ -538,10 +537,10 @@ int mysql_create_function(THD *thd,udf_func *udf) if (!(dl = dlopen(dlpath, RTLD_NOW))) { + my_error(ER_CANT_OPEN_LIBRARY, MYF(0), + udf->dl, errno, my_dlerror(dlpath)); DBUG_PRINT("error",("dlopen of %s failed, error: %d (%s)", udf->dl, errno, dlerror())); - my_error(ER_CANT_OPEN_LIBRARY, MYF(0), - udf->dl, errno, dlerror()); goto err; } new_dl=1; |