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 branch '10.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-17 16:56:38 +01:00
parent 9a7deb1c36 aff5ed3988
commit fd0b47f9d6
629 changed files with 27336 additions and 4573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_update.cc
View File

@ -587,7 +587,8 @@ int mysql_update(THD *thd,
select= make_select(table, 0, 0, conds, (SORT_INFO*) 0, 0, &error);
if (unlikely(error || !limit || thd->is_error() ||
(select && select->check_quick(thd, safe_update, limit))))
(select && select->check_quick(thd, safe_update, limit,
Item_func::BITMAP_ALL))))
{
query_plan.set_impossible_where();
if (thd->lex->describe || thd->lex->analyze_stmt)