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

MDEV-26611: ERROR_INDEX isn't intuitively clear

Browse Source 
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.
This commit is contained in:
Rucha Deodhar
2021-09-29 14:18:40 +05:30
parent e9d8002721
commit d5e606c605
9 changed files with 283 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_error.h
View File

@ -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. */