diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-02 11:05:29 +0200 |
| commit | ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6 (patch) | |
| tree | 5c5c70ee11cdf4414a9cc9a5eacdae881933c70a /sql/sql_update.cc | |
| parent | 5ec40fbb2704a0bf1369836d88a5def4721809c8 (diff) | |
| parent | 09ec8e2e2246f9fb67fd41631c5669d9ae26b2e5 (diff) | |
| download | mariadb-git-ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 65a828147ae..2e9752eeabd 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1104,8 +1104,7 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, DBUG_RETURN(TRUE); if (setup_tables_and_check_access(thd, &select_lex->context, - &select_lex->top_join_list, - table_list, + &select_lex->top_join_list, table_list, select_lex->leaf_tables, FALSE, UPDATE_ACL, SELECT_ACL, TRUE) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || |