database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

12
sql/sql_base.cc
View File

@ -9206,10 +9206,22 @@ fill_record_n_invoke_before_triggers(THD *thd, TABLE *table,
if (!result && triggers)
{
void *save_bulk_param= thd->bulk_param;
/*
Reset the sentinel thd->bulk_param in order not to consume the next
values of a bound array in case one of statement executed by
the trigger's body is INSERT statement.
*/
thd->bulk_param= nullptr;
if (triggers->process_triggers(thd, event, TRG_ACTION_BEFORE,
TRUE) ||
not_null_fields_have_null_values(table))
{
thd->bulk_param= save_bulk_param;
return TRUE;
}
thd->bulk_param= save_bulk_param;
/*
Re-calculate virtual fields to cater for cases when base columns are