mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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.
This commit is contained in:
@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user