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

Merge branch 'bb-10.4-release' into 10.4

Browse Source
This commit is contained in:
Sergei Golubchik
2021-02-23 00:08:56 +01:00
parent 7b8dacc488 53123dfa3e
commit 34fcd726a6
338 changed files with 22217 additions and 4300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_update.cc
View File

@ -1718,6 +1718,9 @@ bool Multiupdate_prelocking_strategy::handle_end(THD *thd)
if (select_lex->handle_derived(thd->lex, DT_MERGE))
DBUG_RETURN(1);
if (thd->lex->save_prep_leaf_tables())
DBUG_RETURN(1);
List<Item> *fields= &lex->first_select_lex()->item_list;
if (setup_fields_with_no_wrap(thd, Ref_ptr_array(),
*fields, MARK_COLUMNS_WRITE, 0, 0))