diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:17:20 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:57:11 +0300 |
| commit | 3f55c569514679d98e09e71286ca28a8ac667a71 (patch) | |
| tree | 4347fbb2238d1a97e5e1166f9e7b7b7adba165ce /sql/sql_update.cc | |
| parent | ca1dc0789b7e724128d1369977e2f70fb9d69bb5 (diff) | |
| parent | a4139f8d68bd31e80ff6202c093cd232c194ddfd (diff) | |
| download | mariadb-git-3f55c569514679d98e09e71286ca28a8ac667a71.tar.gz | |
Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 8ea73439480..578a05d18ae 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1712,8 +1712,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->first_select_lex()->item_list; |