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

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-20 09:57:37 +02:00
parent 8d6c9ef001 cbb24d9aa5
commit 98dbe3bfaf
142 changed files with 3642 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_delete.cc
View File

@@ -742,8 +742,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
table->mark_columns_needed_for_delete();
}
if ((table->file->ha_table_flags() & HA_CAN_FORCE_BULK_DELETE) &&
!table->prepare_triggers_for_delete_stmt_or_event())
if (!table->prepare_triggers_for_delete_stmt_or_event() &&
table->file->ha_table_flags() & HA_CAN_FORCE_BULK_DELETE)
will_batch= !table->file->start_bulk_delete();
/*
@@ -1444,6 +1444,13 @@ void multi_delete::abort_result_set()
{
DBUG_ENTER("multi_delete::abort_result_set");
/****************************************************************************
NOTE: if you change here be aware that almost the same code is in
multi_delete::send_eof().
***************************************************************************/
/* the error was handled or nothing deleted and no side effects return */
if (error_handled ||
(!thd->transaction->stmt.modified_non_trans_table && !deleted))
@@ -1644,6 +1651,13 @@ bool multi_delete::send_eof()
/* reset used flags */
THD_STAGE_INFO(thd, stage_end);
/****************************************************************************
NOTE: if you change here be aware that almost the same code is in
multi_delete::abort_result_set().
***************************************************************************/
if (thd->transaction->stmt.modified_non_trans_table)
thd->transaction->all.modified_non_trans_table= TRUE;
thd->transaction->all.m_unsafe_rollback_flags|=