diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-09 08:30:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-09 08:30:23 +0300 |
| commit | 24232ec12cb6e6d68cd2517389e37842011b6718 (patch) | |
| tree | 658a0014eca5cc588a486badd6c00232e010fd86 /sql/sql_base.cc | |
| parent | ed0793e096a17955c5a03844b248bcf8303dd335 (diff) | |
| parent | d95f96ad1b9f581bb993dcb513aa1c8e089a6ac4 (diff) | |
| download | mariadb-git-24232ec12cb6e6d68cd2517389e37842011b6718.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 5e34958bf59..7276467f188 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3635,32 +3635,6 @@ open_and_process_table(THD *thd, TABLE_LIST *tables, uint *counter, uint flags, goto end; } - if (get_use_stat_tables_mode(thd) > NEVER && tables->table) - { - TABLE_SHARE *table_share= tables->table->s; - if (table_share && table_share->table_category == TABLE_CATEGORY_USER && - table_share->tmp_table == NO_TMP_TABLE) - { - if (table_share->stats_cb.stats_can_be_read || - !alloc_statistics_for_table_share(thd, table_share, FALSE)) - { - if (table_share->stats_cb.stats_can_be_read) - { - KEY *key_info= table_share->key_info; - KEY *key_info_end= key_info + table_share->keys; - KEY *table_key_info= tables->table->key_info; - for ( ; key_info < key_info_end; key_info++, table_key_info++) - table_key_info->read_stats= key_info->read_stats; - Field **field_ptr= table_share->field; - Field **table_field_ptr= tables->table->field; - for ( ; *field_ptr; field_ptr++, table_field_ptr++) - (*table_field_ptr)->read_stats= (*field_ptr)->read_stats; - tables->table->stats_is_read= table_share->stats_cb.stats_is_read; - } - } - } - } - process_view_routines: /* Again we may need cache all routines used by this view and add |