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ä
2019-04-25 09:05:52 +03:00
parent 765ae6e821 bc145193c1
commit acf6f92aa9
60 changed files with 1130 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_update.cc
View File

@ -355,6 +355,8 @@ int mysql_update(THD *thd,
if (lock_tables(thd, table_list, table_count, 0))
DBUG_RETURN(1);
(void) read_statistics_for_tables_if_needed(thd, table_list);
THD_STAGE_INFO(thd, stage_init_update);
if (table_list->handle_derived(thd->lex, DT_MERGE_FOR_INSERT))
DBUG_RETURN(1);
@ -1688,6 +1690,7 @@ int mysql_multi_update_prepare(THD *thd)
{
DBUG_RETURN(TRUE);
}
(void) read_statistics_for_tables_if_needed(thd, table_list);
/* @todo: downgrade the metadata locks here. */
/*