database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2021-06-01 08:40:59 +03:00
parent 1e5ebf3762 2fb4407827
commit 950a220060
37 changed files with 986 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@ -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);