summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2021-04-28 17:39:04 -0700
committerIgor Babaev <igor@askmonty.org>2021-04-28 17:39:04 -0700
commitb1ac251bf1668d5d2472c2c520d6db71fb835065 (patch)
treef5106d7fa0cafff8553f06854e73feaa9ce45abf /sql/sql_update.cc
parente788738e18bd5cedb21f75b21f902f1bbcc34719 (diff)
downloadmariadb-git-b1ac251bf1668d5d2472c2c520d6db71fb835065.tar.gz
Another correction of the patch for MDEV-24823.
This commits replaces the call of the function setup_tables() with a call of the function setup_tables_and_check_access() in the method Multiupdate_prelocking_strategy::handle_end(). There is no known bug that would require this change. However the change aligns this piece of code with the code existed before the patch for MDEV-24823.
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index e8b973c03bd..ec27ccda778 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1390,8 +1390,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;