diff options
| author | unknown <bell@52.0.168.192.in-addr.arpa> | 2005-02-23 19:22:52 +0200 |
|---|---|---|
| committer | unknown <bell@52.0.168.192.in-addr.arpa> | 2005-02-23 19:22:52 +0200 |
| commit | 2c1ef3c604fb87fe0f5484d4174bee72c59a88ae (patch) | |
| tree | 78f2044bceb113c001dadb36382ad3fe8363df7b /sql/sql_error.cc | |
| parent | b1b896cfb3bbb3488d4e6b3e43a095e279590576 (diff) | |
| parent | e09a6c1a203e986b4c4d34cf8a8b72b39e4c573d (diff) | |
| download | mariadb-git-2c1ef3c604fb87fe0f5484d4174bee72c59a88ae.tar.gz | |
Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/protocol.cc:
Auto merged
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index d0f06c47edb..79f7579d311 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -106,6 +106,9 @@ 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_SQL_NOTES)) + return(0); + if (thd->query_id != thd->warn_id) mysql_reset_errors(thd); thd->got_warning= 1; |