diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-06 17:43:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-06 17:43:02 +0200 |
| commit | 734510a44d690dfb94264e1d2775ee1cb6f3ebb9 (patch) | |
| tree | 0ccc317bf9462ca95cd1277b4ce65a7fda5fe315 /sql/sql_signal.cc | |
| parent | 2465d3e00b2f18c7d4967f9bb10438883682787d (diff) | |
| parent | faf206a848684bc0f87c93a2b47a55063bbccc6c (diff) | |
| download | mariadb-git-734510a44d690dfb94264e1d2775ee1cb6f3ebb9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_signal.cc')
| -rw-r--r-- | sql/sql_signal.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc index 83abaebd4fd..359b5e45f01 100644 --- a/sql/sql_signal.cc +++ b/sql/sql_signal.cc @@ -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; |