diff options
| author | unknown <pem@mysql.comhem.se> | 2005-04-22 12:53:48 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2005-04-22 12:53:48 +0200 |
| commit | 83a8ee38e02791de1fe53a19d6cbca21edca6f97 (patch) | |
| tree | 16dd7ce5d1e2706f17774842c3d21d96d28bbe63 /sql/sql_error.cc | |
| parent | 4f1f0b670bf0f67b4856c9805f3a1b73c2e2915a (diff) | |
| download | mariadb-git-83a8ee38e02791de1fe53a19d6cbca21edca6f97.tar.gz | |
Fixed BUG#9004: Inconsistent behaviour of SP re. warnings
mysql-test/r/sp.result:
New test case for BUG#9004.
Also updated some other results, since formerly "invisible" (but correct)
warnings now are visible.
mysql-test/t/sp.test:
New test case for BUG#9004.
sql/sql_error.cc:
Don't reset warnings while executing a stored routine.
sql/sql_parse.cc:
Don't reset warnings while executing a stored routine.
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 04fd27abef5..3bda16202b9 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -113,7 +113,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, !(thd->options & OPTION_SQL_NOTES)) DBUG_RETURN(0); - if (thd->query_id != thd->warn_id) + if (thd->query_id != thd->warn_id && !thd->spcont) mysql_reset_errors(thd, 0); thd->got_warning= 1; |