diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 10:38:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 10:38:09 +0300 |
| commit | 9c7a456a92262bdb44b85a05aa9f87369c5b063c (patch) | |
| tree | ae2354c36aa3220a6ca5e8becc41491b52b9881c /sql/sql_update.cc | |
| parent | 2a4f72b7d2ac30a771a14d097608b0ce282e021c (diff) | |
| parent | 77d8da57d744505838a7830afbc437e54cc03c50 (diff) | |
| download | mariadb-git-9c7a456a92262bdb44b85a05aa9f87369c5b063c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 578a05d18ae..c14585f44c5 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -468,6 +468,8 @@ int mysql_update(THD *thd, want_privilege= (table_list->view ? UPDATE_ACL : table_list->grant.want_privilege); #endif + promote_select_describe_flag_if_needed(thd->lex); + if (mysql_prepare_update(thd, table_list, &conds, order_num, order)) DBUG_RETURN(1); |