database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Automatic merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2009-10-28 16:56:07 +02:00
parent d271502048 f3e3fe866b
commit 056cebe61a
58 changed files with 2456 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_plugin.cc
View File

@ -367,8 +367,8 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
{
if (report & REPORT_TO_USER)
my_error(ER_UDF_NO_PATHS, MYF(0));
if (report & REPORT_TO_LOG)
sql_print_error(ER(ER_UDF_NO_PATHS));
if ((report & (REPORT_TO_LOG | REPORT_TO_USER)) == REPORT_TO_LOG)
sql_print_error("%s", ER(ER_UDF_NO_PATHS));
DBUG_RETURN(0);
}
/* If this dll is already loaded just increase ref_count. */