database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-08-20 10:00:39 +02:00
parent 62bfcfd8b2 fc5772ce17
commit 70afc62750
17 changed files with 594 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_error.cc
View File

@@ -309,14 +309,27 @@ Diagnostics_area::reset_diagnostics_area()
m_message[0]= '\0';
Sql_state_errno::clear();
Sql_user_condition_identity::clear();
m_affected_rows= 0;
m_last_insert_id= 0;
m_statement_warn_count= 0;
if (!is_bulk_op())
{
m_affected_rows= 0;
m_statement_warn_count= 0;
}
#endif
get_warning_info()->clear_error_condition();
set_is_sent(false);
/** Tiny reset in debug mode to see garbage right away */
m_status= DA_EMPTY;
if (!is_bulk_op())
/*
For BULK DML operations (e.g. UPDATE) the data member m_status
has the value DA_OK_BULK. Keep this value in order to handle
m_affected_rows, m_statement_warn_count in correct way. Else,
the number of rows and the number of warnings affected by
the last statement executed as part of a trigger fired by the dml
(e.g. UPDATE statement fires a trigger on AFTER UPDATE) would counts
rows modified by trigger's statement.
*/
m_status= DA_EMPTY;
DBUG_VOID_RETURN;
}