diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-10-15 00:40:06 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-10-15 19:00:27 +0530 |
| commit | afa411cda0ccebe822f3dd86acc359d0f61b746f (patch) | |
| tree | f87012568da02b83eb2485f0e5fb70c5290e75d0 /sql/sql_signal.cc | |
| parent | a6cf8b34a834e5d16155f8bb3f33d57a4f87eb9e (diff) | |
| download | mariadb-git-bb-10.7-MDEV-26832.tar.gz | |
MDEV-26832: ROW_NUMBER in SIGNAL/RESIGNAL causes a syntax errorbb-10.7-MDEV-26832
Analysis: Parser was missing ROW_NUMBER as syntax for SIGNAL and RESIGNAL.
Fix: Fix parser and fix how m_row_number is copied like other attributes
to avoid ROW_NUMBER from assuming default value.
Diffstat (limited to 'sql/sql_signal.cc')
| -rw-r--r-- | sql/sql_signal.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc index e023923bd1a..6ccc16c53e5 100644 --- a/sql/sql_signal.cc +++ b/sql/sql_signal.cc @@ -44,6 +44,7 @@ const LEX_CSTRING Diag_condition_item_names[]= { STRING_WITH_LEN("CURSOR_NAME") }, { STRING_WITH_LEN("MESSAGE_TEXT") }, { STRING_WITH_LEN("MYSQL_ERRNO") }, + { STRING_WITH_LEN("ROW_NUMBER") }, { STRING_WITH_LEN("CONDITION_IDENTIFIER") }, { STRING_WITH_LEN("CONDITION_NUMBER") }, @@ -309,6 +310,26 @@ int Sql_cmd_common_signal::eval_signal_informations(THD *thd, Sql_condition *con cond->m_sql_errno= (int) code; } + set= m_set_signal_information.m_item[DIAG_ROW_NUMBER]; + if (set != NULL) + { + if (set->is_null()) + { + thd->raise_error_printf(ER_WRONG_VALUE_FOR_VAR, + "ROW_NUMBER", "NULL"); + goto end; + } + longlong row_number_value= set->val_int(); + if (row_number_value < 0) + { + str= set->val_str(& str_value); + thd->raise_error_printf(ER_WRONG_VALUE_FOR_VAR, + "ROW_NUMBER", str->c_ptr_safe()); + goto end; + } + cond->m_row_number= (ulong) row_number_value; + } + /* The various item->val_xxx() methods don't return an error code, but flag thd in case of failure. |