diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-04-08 12:52:53 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-04-08 12:52:53 +0300 |
| commit | db1d83a5cca4c1b9d96b8580ae2bde80a31f1ad8 (patch) | |
| tree | f227c794a048f6e49813e5564f749f4467d6333f /sql/sql_plugin.cc | |
| parent | a91e89dec672cd954d20fbe729006f2845bd32ed (diff) | |
| parent | 04ff96f7891cf4a714a3f60a4ec15b5ead7a3f31 (diff) | |
| download | mariadb-git-db1d83a5cca4c1b9d96b8580ae2bde80a31f1ad8.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 1094053e41b..a2bb1127839 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1886,9 +1886,10 @@ bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING *dl if (tmp->state == PLUGIN_IS_DISABLED) { - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_CANT_INITIALIZE_UDF, ER(ER_CANT_INITIALIZE_UDF), - name->str, "Plugin is disabled"); + if (global_system_variables.log_warnings) + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_CANT_INITIALIZE_UDF, ER(ER_CANT_INITIALIZE_UDF), + name->str, "Plugin is disabled"); } else { |