diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 09:14:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 09:14:59 +0300 |
| commit | 77d8da57d744505838a7830afbc437e54cc03c50 (patch) | |
| tree | 3c7ce417ece9fa900ca7797cfd6902ddfee0e21d /sql/sql_delete.cc | |
| parent | 26f9ff0a6006e2c473623a54612cbcbf77e02058 (diff) | |
| parent | 950a2200603d5b4a8f7e978624f38a46bca896bc (diff) | |
| download | mariadb-git-77d8da57d744505838a7830afbc437e54cc03c50.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 9fa1e015274..b295be5e41e 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -378,6 +378,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, query_plan.table= table; query_plan.updating_a_view= MY_TEST(table_list->view); + promote_select_describe_flag_if_needed(thd->lex); + if (mysql_prepare_delete(thd, table_list, select_lex->with_wild, select_lex->item_list, &conds, &delete_while_scanning)) |