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

MDEV-30469 Feature rebase

Browse Source 
Upon rebase, some error codes changed order so record tests to
update accordingly.  Merge with trigger changes from MDEV-34724.
This commit is contained in:
Dave Gosselin
2025-02-05 10:41:11 -05:00
parent 5e07d1abd4
commit edd52b7fc7
3 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_delete.cc
View File

@@ -1355,13 +1355,19 @@ int multi_delete::send_data(List<Item> &values)
if (secure_counter < 0)
{
bool trg_skip_row= false;
/* We are scanning the current table */
DBUG_ASSERT(del_table == table_being_deleted);
if (table->triggers &&
table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
TRG_ACTION_BEFORE, false))
TRG_ACTION_BEFORE, false,
&trg_skip_row))
DBUG_RETURN(1);
if (trg_skip_row)
continue;
table->status|= STATUS_DELETED;
error= table->delete_row();
@@ -1372,7 +1378,8 @@ int multi_delete::send_data(List<Item> &values)
thd->transaction->stmt.modified_non_trans_table= TRUE;
if (table->triggers &&
table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
TRG_ACTION_AFTER, false))
TRG_ACTION_AFTER, false,
nullptr))
DBUG_RETURN(1);
}
else if (!ignore)
@@ -1584,14 +1591,21 @@ int multi_delete::rowid_table_deletes(TABLE *table, bool ignore)
continue;
}
bool trg_skip_row= false;
if (table->triggers &&
unlikely(table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
TRG_ACTION_BEFORE, FALSE)))
TRG_ACTION_BEFORE, FALSE,
&trg_skip_row)))
{
err_table= table;
local_error= 1;
break;
}
if (trg_skip_row)
continue;
local_error= table->delete_row();
if (unlikely(local_error) && !ignore)
{
@@ -1609,7 +1623,8 @@ int multi_delete::rowid_table_deletes(TABLE *table, bool ignore)
deleted++;
if (table->triggers &&
table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
TRG_ACTION_AFTER, FALSE))
TRG_ACTION_AFTER, FALSE,
nullptr))
{
err_table= table;
local_error= 1;