revision-id: b1ac251bf1668d5d2472c2c520d6db71fb835065 (mariadb-10.2.31-917-gb1ac251) parent(s): e788738e18bd5cedb21f75b21f902f1bbcc34719 author: Igor Babaev committer: Igor Babaev timestamp: 2021-04-28 17:39:04 -0700 message: 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. --- sql/sql_update.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/sql_update.cc b/sql/sql_update.cc index e8b973c..ec27ccd 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;