database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-10075: Provide index of error causing error in array INSERT

Browse Source 
Extended the parser for GET DIAGNOSTICS to use ERROR_INDEX to get
warning/error index.
Error information is stored in Sql_condition. So it can be used to
store the index of warning/error too. THD::current_insert_index keeps a
track of count for each row that is processed or going to be inserted in the
table (or first row in case of prepare phase). When an error occurs,
first we need to fetch corrected error index (using correct_error_index())
for an error number. This is needed because in prepare phase, the error
may not be because of rows/values. In such case, correct value of
error_index should be 0. Once correct value if fetched, assign it to
Sql_condition::error_index when the object is created during error/warning.
This error_index variable is returned when ERROR_INDEX is used in
GET DIAGNOSTICS.
This commit is contained in:
Rucha Deodhar
2021-07-31 12:55:21 +05:30
committed by Sergei Golubchik
parent 50e08f3da0
commit ea06c67a49
16 changed files with 1501 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_error.h
View File

@ -396,7 +396,7 @@ private:
*/
Sql_condition()
:m_mem_root(NULL)
{ }
{ error_index= 0; }
/**
Complete the Sql_condition initialisation.
@ -419,6 +419,7 @@ private:
:m_mem_root(mem_root)
{
DBUG_ASSERT(mem_root != NULL);
error_index= 0;
}
Sql_condition(MEM_ROOT *mem_root, const Sql_user_condition_identity &ucid)
@ -426,6 +427,7 @@ private:
m_mem_root(mem_root)
{
DBUG_ASSERT(mem_root != NULL);
error_index= 0;
}
/**
Constructor for a fixed message text.
@ -436,7 +438,8 @@ private:
*/
Sql_condition(MEM_ROOT *mem_root,
const Sql_condition_identity &value,
const char *msg)
const char *msg,
ulonglong current_error_index)
:Sql_condition_identity(value),
m_mem_root(mem_root)
{
@ -444,6 +447,7 @@ private:
DBUG_ASSERT(value.get_sql_errno() != 0);
DBUG_ASSERT(msg != NULL);
set_builtin_message_text(msg);
error_index= current_error_index;
}
/** Destructor. */
@ -497,6 +501,9 @@ private:
/** Memory root to use to hold condition item values. */
MEM_ROOT *m_mem_root;
/* Index of error for INSERT/REPLACE statement. */
ulonglong error_index;
};
///////////////////////////////////////////////////////////////////////////