diff options
| author | lars@mysql.com <> | 2005-02-21 18:40:28 +0100 |
|---|---|---|
| committer | lars@mysql.com <> | 2005-02-21 18:40:28 +0100 |
| commit | be28ef0a20b67900e2e6156ff99b898407a78317 (patch) | |
| tree | b5fa7db32611dc285b185068666727e0844c2fdc /sql/sql_error.cc | |
| parent | 3261bf189ac2667697b58a101e2940fe01e90695 (diff) | |
| download | mariadb-git-be28ef0a20b67900e2e6156ff99b898407a78317.tar.gz | |
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index eab5ec890df..e04c2843c93 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -104,6 +104,10 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, { MYSQL_ERROR *err= 0; DBUG_ENTER("push_warning"); + + if (level == MYSQL_ERROR::WARN_LEVEL_NOTE && !(thd->options & OPTION_NOTES)) + return(0); + if (thd->query_id != thd->warn_id) mysql_reset_errors(thd); |