diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
| commit | c32f71af7e4b747de223bf6b44e691941f5997cf (patch) | |
| tree | 03270b9a849e165f1c8605102ee06bced2331477 /sql/sql_update.cc | |
| parent | 4d41f316c3c1c05fdd35cbdc1b626d596b89af40 (diff) | |
| parent | 555c6632c69d707cc1641ef396e7b66a65f14bdc (diff) | |
| download | mariadb-git-c32f71af7e4b747de223bf6b44e691941f5997cf.tar.gz | |
Merge branch '10.2' into 10.3
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 56ff0ee4b34..2eb2374091e 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1281,8 +1281,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) || |