database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-01-06 17:43:02 +02:00
parent 2465d3e00b faf206a848
commit 734510a44d
155 changed files with 2039 additions and 2610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_signal.cc
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;