diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-09-29 14:18:40 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-09-29 14:28:14 +0530 |
| commit | 28224147833e59f47491e05f247948a774b4c712 (patch) | |
| tree | f94eb508bbc0a2a0422d5fc97855056938e3ac25 /sql/sql_get_diagnostics.cc | |
| parent | 8dd4794c4e11b8790fadf0c203bcd118e7b755e8 (diff) | |
| download | mariadb-git-bb-10.7-MDEV-26611.tar.gz | |
MDEV-26611: ERROR_INDEX isn't intuitively clearbb-10.7-MDEV-26611
Fixup for MDEV-10075
Analysis: ERROR_INDEX implemented in MDEV-10075 was not intuitively clear.
Fix: changed parser to use ROW_NUMBER instead of ERROR_INDEX. Removed
ERROR_INDEX and ERROR_INDEX_SYM from related files. Changed m_error_index
to m_row_number.
Diffstat (limited to 'sql/sql_get_diagnostics.cc')
| -rw-r--r-- | sql/sql_get_diagnostics.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_get_diagnostics.cc b/sql/sql_get_diagnostics.cc index 6a479726df1..240975d2974 100644 --- a/sql/sql_get_diagnostics.cc +++ b/sql/sql_get_diagnostics.cc @@ -338,8 +338,8 @@ Condition_information_item::get_value(THD *thd, const Sql_condition *cond) str.set_ascii(cond->get_sqlstate(), strlen(cond->get_sqlstate())); value= make_utf8_string_item(thd, &str); break; - case ERROR_INDEX: - value= new (thd->mem_root) Item_uint(thd, cond->m_error_index); + case ROW_NUMBER: + value= new (thd->mem_root) Item_uint(thd, cond->m_row_number); } DBUG_RETURN(value); |