database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-17 12:02:09 +03:00
Code Activity

Merge branch bb-10.2-release into bb-10.3-release

Browse Source
This commit is contained in:
Nikita Malyavin
2021-05-04 14:49:31 +03:00
parent 2820f30dde 72fa9dabad
commit a8a925dd22
88 changed files with 1696 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_update.cc
View File

@ -1571,8 +1571,9 @@ bool Multiupdate_prelocking_strategy::handle_end(THD *thd)
call in setup_tables()).
*/
if (setup_tables(thd, &select_lex->context, &select_lex->top_join_list,
table_list, select_lex->leaf_tables, FALSE, TRUE))
if (setup_tables_and_check_access(thd, &select_lex->context,
&select_lex->top_join_list, table_list, select_lex->leaf_tables,
FALSE, UPDATE_ACL, SELECT_ACL, TRUE))
DBUG_RETURN(1);
List<Item> *fields= &lex->select_lex.item_list;