diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 08:40:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 08:40:59 +0300 |
| commit | 950a2200603d5b4a8f7e978624f38a46bca896bc (patch) | |
| tree | 70f3201421051f85e198e6c557d020327ccc8469 /sql/sql_update.cc | |
| parent | 1e5ebf3762abdb8108620b46e76d4ebdde8472f7 (diff) | |
| parent | 2fb4407827ecd6cbf52e210a8d9370b4560ddd5b (diff) | |
| download | mariadb-git-950a2200603d5b4a8f7e978624f38a46bca896bc.tar.gz | |
Merge 10.2 into 10.3
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 eeed815b716..1c4d5cd9b52 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -399,6 +399,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); |