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 '11.0' into 11.1

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-19 20:11:54 +01:00
parent fa2e1c3948 8c8bce05d2
commit 7a5448f8da
672 changed files with 27790 additions and 5130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_delete.cc
View File

@@ -505,9 +505,9 @@ bool Sql_cmd_delete::delete_from_single_table(THD *thd)
select=make_select(table, 0, 0, conds, (SORT_INFO*) 0, 0, &error);
if (unlikely(error))
DBUG_RETURN(TRUE);
if (unlikely((select && select->check_quick(thd, safe_update, limit)) ||
table->stat_records() == 0 ||
!limit))
if ((select && select->check_quick(thd, safe_update, limit,
Item_func::BITMAP_ALL)) || !limit ||
table->stat_records() == 0)
{
query_plan.set_impossible_where();
if (thd->lex->describe || thd->lex->analyze_stmt)