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

Improve error message for ER_CANT_FIND_DL_ENTRY

Browse Source 
Added name of the dll/udf that caused the error.
This commit is contained in:
Monty
2024-05-03 10:44:41 +03:00
committed by Sergei Golubchik
parent 9293d40fa7
commit 9c7e57a41b
5 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_plugin.cc
View File

@@ -543,7 +543,7 @@ static my_bool read_mysql_plugin_info(struct st_plugin_dl *plugin_dl,
/* Determine interface version */
if (!sym)
{
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, plugin_interface_version_sym);
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, plugin_interface_version_sym, dlpath);
DBUG_RETURN(TRUE);
}
plugin_dl->mariaversion= 0;
@@ -559,7 +559,7 @@ static my_bool read_mysql_plugin_info(struct st_plugin_dl *plugin_dl,
/* Find plugin declarations */
if (!(sym= dlsym(plugin_dl->handle, plugin_declarations_sym)))
{
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, plugin_declarations_sym);
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, plugin_declarations_sym, dlpath);
DBUG_RETURN(TRUE);
}
@@ -663,7 +663,7 @@ static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl,
version we try mysql version.
*/
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags,
maria_plugin_interface_version_sym);
maria_plugin_interface_version_sym, dlpath);
DBUG_RETURN(TRUE);
}
plugin_dl->mariaversion= *(int *)sym;
@@ -679,7 +679,7 @@ static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl,
/* Find plugin declarations */
if (!(sym= dlsym(plugin_dl->handle, maria_plugin_declarations_sym)))
{
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, maria_plugin_declarations_sym);
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, maria_plugin_declarations_sym, dlpath);
DBUG_RETURN(TRUE);
}
if (plugin_dl->mariaversion != MARIA_PLUGIN_INTERFACE_VERSION)
@@ -692,7 +692,8 @@ static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl,
sizeof_st_plugin= *(int *)sym;
else
{
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, maria_sizeof_st_plugin_sym);
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, maria_sizeof_st_plugin_sym,
dlpath);
DBUG_RETURN(TRUE);
}
@@ -1221,7 +1222,7 @@ err:
DBUG_ASSERT(!name->str || !dupes); // dupes is ONLY for name->str == 0
if (errs == 0 && oks == 0 && !dupes) // no plugin was found
my_error(ER_CANT_FIND_DL_ENTRY, MyFlags, name->str);
my_error(ER_PLUGIN_IS_NOT_LOADED, MyFlags, name->str);
plugin_dl_del(tmp.plugin_dl);
if (errs > 0 || oks + dupes == 0)