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

Merge remote-tracking branch 'github/bb-11.4-release' into bb-11.8-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-27 11:33:27 +02:00
committed by Oleksandr Byelkin
parent a0b77eb806 a8d4642375
commit 237e24497b
430 changed files with 14769 additions and 6751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_delete.cc
View File

@@ -336,7 +336,6 @@ bool Sql_cmd_delete::delete_from_single_table(THD *thd)
SQL_SELECT *select= 0;
SORT_INFO *file_sort= 0;
READ_RECORD info;
ha_rows deleted= 0;
bool reverse= FALSE;
bool binlog_is_row;
killed_state killed_status= NOT_KILLED;
@@ -454,6 +453,7 @@ bool Sql_cmd_delete::delete_from_single_table(THD *thd)
has_triggers= table->triggers && table->triggers->has_delete_triggers();
transactional_table= table->file->has_transactions_and_rollback();
deleted= 0;
if (!returning && !using_limit && const_cond_result &&
(!thd->is_current_stmt_binlog_format_row() && !has_triggers)
@@ -1035,7 +1035,7 @@ cleanup:
result->send_eof();
else
my_ok(thd, deleted);
DBUG_PRINT("info",("%ld records deleted",(long) deleted));
DBUG_PRINT("info", ("%ld records deleted", (long) deleted));
}
delete file_sort;
if (optimize_subqueries && select_lex->optimize_unflattened_subqueries(false))
@@ -2103,6 +2103,9 @@ bool Sql_cmd_delete::execute_inner(THD *thd)
if (result)
{
/* In single table case, this->deleted set by delete_from_single_table */
if (res && multitable)
deleted= ((multi_delete*)get_result())->num_deleted();
res= false;
delete result;
}