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

Browse Source
This commit is contained in:
Vladislav Vaintroub
2021-07-16 22:12:09 +02:00
parent 461cac8901 fc2ec25733
commit e7f4daf88c
35 changed files with 442 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_delete.cc
View File

@ -709,7 +709,12 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
!table->prepare_triggers_for_delete_stmt_or_event())
will_batch= !table->file->start_bulk_delete();
if (returning)
/*
thd->get_stmt_da()->is_set() means first iteration of prepared statement
with array binding operation execution (non optimized so it is not
INSERT)
*/
if (returning && !thd->get_stmt_da()->is_set())
{
if (result->send_result_set_metadata(returning->item_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))