diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-04 00:48:40 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-04 00:48:40 +0300 |
| commit | f141542a5b29bf47b59155923c7ccac031db62f2 (patch) | |
| tree | 737674a83beb16e444848c8c4a66a3de08696065 /sql/sql_trigger.cc | |
| parent | ac8990cb7d3f4b5282da2d034124e0dbe996ce8d (diff) | |
| parent | 31740ffdfcc651f9b6ebc335110fa498b3bc13fd (diff) | |
| download | mariadb-git-f141542a5b29bf47b59155923c7ccac031db62f2.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 71216d74e6e..a32afac86d9 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1208,12 +1208,13 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, DBUG_RETURN(1); // EOM } - - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_TRG_NO_CREATION_CTX, - ER(ER_TRG_NO_CREATION_CTX), - (const char*) db, - (const char*) table_name); + + if (!thd->no_warnings_for_error) + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_TRG_NO_CREATION_CTX, + ER(ER_TRG_NO_CREATION_CTX), + (const char*) db, + (const char*) table_name); if (!(trg_client_cs_name= alloc_lex_string(&table->mem_root)) || !(trg_connection_cl_name= alloc_lex_string(&table->mem_root)) || @@ -1342,12 +1343,12 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, MySQL, which does not support triggers definers. We should emit warning here. */ - - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_TRG_NO_DEFINER, ER(ER_TRG_NO_DEFINER), - (const char*) db, - (const char*) lex.sphead->m_name.str); - + if (!thd->no_warnings_for_error) + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_TRG_NO_DEFINER, ER(ER_TRG_NO_DEFINER), + (const char*) db, + (const char*) lex.sphead->m_name.str); + /* Set definer to the '' to correct displaying in the information schema. |