diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-10-28 16:56:07 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-10-28 16:56:07 +0200 |
| commit | 056cebe61a43e55fb7d5906dbcb9108993ae4ce5 (patch) | |
| tree | 2d08cc0ff4d23012d05ddab364d43cd9f54a9d17 /sql/sql_plugin.cc | |
| parent | d27150204803b44b324833a1625301abc53cb9b8 (diff) | |
| parent | f3e3fe866bfaa14986db5bb6a10e5c130af69137 (diff) | |
| download | mariadb-git-056cebe61a43e55fb7d5906dbcb9108993ae4ce5.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 1818b5793f9..ed6cc54b37f 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -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. */ |