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 '10.5' into 10.6

Browse Source
This commit is contained in:
Yuchen Pei
2024-12-17 11:06:09 +11:00
parent c982a143fc 77c9917663
commit 671f80c738
48 changed files with 735 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_trigger.cc
View File

@@ -2479,6 +2479,14 @@ bool Table_triggers_list::process_triggers(THD *thd,
*/
save_current_select= thd->lex->current_select;
/*
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 a DML statement.
*/
void *save_bulk_param= thd->bulk_param;
thd->bulk_param= nullptr;
do {
thd->lex->current_select= NULL;
err_status=
@@ -2488,6 +2496,7 @@ bool Table_triggers_list::process_triggers(THD *thd,
&trigger->subject_table_grants);
status_var_increment(thd->status_var.executed_triggers);
} while (!err_status && (trigger= trigger->next));
thd->bulk_param= save_bulk_param;
thd->lex->current_select= save_current_select;
thd->restore_sub_statement_state(&statement_state);