diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
| commit | e6bdf77e4be48750c4808a09af197ed91fd69a61 (patch) | |
| tree | 2ca921747b9ae7b01835efe9609799b27efb1387 /sql/sql_update.cc | |
| parent | 1599825ffc2c942f8b63274a9556b425229375c7 (diff) | |
| parent | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (diff) | |
| download | mariadb-git-e6bdf77e4be48750c4808a09af197ed91fd69a61.tar.gz | |
Merge 10.3 into 10.4
In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
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 775a77c82d2..cf1b5ac3892 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -403,6 +403,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); @@ -1807,6 +1809,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. */ /* |