diff options
| author | monty@mysql.com <> | 2005-02-24 23:33:42 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-02-24 23:33:42 +0200 |
| commit | cd78e701a5c83394c360f6ba9a1783c7b950e8ee (patch) | |
| tree | 7dbb7787461bf6040b70c1701768dfa24df638d8 /sql/sql_error.cc | |
| parent | d5f573713aeac2bde0d1fa9d6c8cc38559f81cdc (diff) | |
| download | mariadb-git-cd78e701a5c83394c360f6ba9a1783c7b950e8ee.tar.gz | |
Show all generated warnings in SHOW ERROR
Previously we only stored the first given error (the error sent to the client)
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 79f7579d311..4d254b95514 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -106,8 +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 (level == MYSQL_ERROR::WARN_LEVEL_NOTE && + !(thd->options & OPTION_SQL_NOTES)) + DBUG_RETURN(0); if (thd->query_id != thd->warn_id) mysql_reset_errors(thd); @@ -126,9 +127,14 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, if ((int) level >= (int) MYSQL_ERROR::WARN_LEVEL_WARN && thd->really_abort_on_warning()) { + /* Avoid my_message() calling push_warning */ + bool no_warnings_for_error= thd->no_warnings_for_error; + thd->no_warnings_for_error= 1; thd->killed= THD::KILL_BAD_DATA; my_message(code, msg, MYF(0)); - DBUG_RETURN(NULL); + thd->no_warnings_for_error= no_warnings_for_error; + /* Store error in error list (as my_message() didn't do it in this case */ + level= MYSQL_ERROR::WARN_LEVEL_ERROR; } if (thd->warn_list.elements < thd->variables.max_error_count) |