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

Merge branch '11.8' into main

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-18 12:07:02 +02:00
parent cb2d6abae1 805e7ca3ad
commit 9b824e62d4
871 changed files with 11314 additions and 6371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_error.cc
View File

@@ -329,18 +329,16 @@ Diagnostics_area::reset_diagnostics_area()
#endif
get_warning_info()->clear_error_condition();
set_is_sent(false);
/** Tiny reset in debug mode to see garbage right away */
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;
/*
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= is_bulk_op() ? DA_OK_BULK : DA_EMPTY;
DBUG_VOID_RETURN;
}