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_error.h | |
| 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_error.h')
| -rw-r--r-- | sql/sql_error.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h index b6ed7f5061a..e7f1a27a6a7 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -306,7 +306,8 @@ protected: /** SQL CURSOR_NAME condition item. */ String m_cursor_name; - ulong m_error_index; + /** SQL ROW_NUMBER condition item. */ + ulong m_row_number; Sql_condition_items() :m_class_origin((const char*) NULL, 0, & my_charset_utf8mb3_bin), @@ -319,7 +320,7 @@ protected: m_table_name((const char*) NULL, 0, & my_charset_utf8mb3_bin), m_column_name((const char*) NULL, 0, & my_charset_utf8mb3_bin), m_cursor_name((const char*) NULL, 0, & my_charset_utf8mb3_bin), - m_error_index(0) + m_row_number(0) { } void clear() @@ -334,7 +335,7 @@ protected: m_table_name.length(0); m_column_name.length(0); m_cursor_name.length(0); - m_error_index= 0; + m_row_number= 0; } }; @@ -446,7 +447,7 @@ private: DBUG_ASSERT(value.get_sql_errno() != 0); DBUG_ASSERT(msg != NULL); set_builtin_message_text(msg); - m_error_index= current_row_for_warning; + m_row_number= current_row_for_warning; } /** Destructor. */ |