1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

MDEV-16036: Debug assertion failed in resignal on create temporary table

Reising condition on NOTW controlled by OPTION_SQL_NOTES.
This commit is contained in:
Oleksandr Byelkin
2018-12-20 11:22:13 +01:00
parent b26736cdb1
commit 2999492c32
3 changed files with 75 additions and 4 deletions

View File

@ -343,13 +343,15 @@ bool Sql_cmd_common_signal::raise_condition(THD *thd, Sql_condition *cond)
if (eval_signal_informations(thd, cond))
DBUG_RETURN(result);
/* SIGNAL should not signal WARN_LEVEL_NOTE */
DBUG_ASSERT((cond->m_level == Sql_condition::WARN_LEVEL_WARN) ||
(cond->m_level == Sql_condition::WARN_LEVEL_ERROR));
/* SIGNAL should not signal WARN_LEVEL_NOTE, but RESIGNAL can */
DBUG_ASSERT(cond->m_level == Sql_condition::WARN_LEVEL_ERROR ||
cond->m_level != Sql_condition::WARN_LEVEL_NOTE ||
sql_command_code() == SQLCOM_RESIGNAL);
(void) thd->raise_condition(cond);
if (cond->m_level == Sql_condition::WARN_LEVEL_WARN)
if (cond->m_level == Sql_condition::WARN_LEVEL_WARN ||
cond->m_level == Sql_condition::WARN_LEVEL_NOTE)
{
my_ok(thd);
result= FALSE;