diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
| commit | bc145193c164b895a52b943e73fff53952d48a60 (patch) | |
| tree | 278a02f85834d7ed8fa6933959e9b3b96655d1e1 /sql/sql_update.cc | |
| parent | 1f1a61cfc41a01ffa65d568eebdc037a54b5c463 (diff) | |
| parent | bfb0726fc24acb896e54bc7ef7536ad1aab9d574 (diff) | |
| download | mariadb-git-bc145193c164b895a52b943e73fff53952d48a60.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 11ffa684216..80ecd820046 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -302,6 +302,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); + if (table_list->handle_derived(thd->lex, DT_MERGE_FOR_INSERT)) DBUG_RETURN(1); if (table_list->handle_derived(thd->lex, DT_PREPARE)) @@ -1517,6 +1519,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. */ /* |