diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2018-12-19 17:08:51 +1100 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-02-24 10:47:15 -0500 |
| commit | 31b65d3dd211826b194a9a2e6894816ccd05b707 (patch) | |
| tree | cb60117cae8c44c69fadcee85d3cb50701e55fc3 /sql/sql_base.h | |
| parent | 6471c156f1b406973f2455bcf333f1b4bcf1198b (diff) | |
| download | mariadb-git-31b65d3dd211826b194a9a2e6894816ccd05b707.tar.gz | |
stop covering_keys from being set to the same thing twice
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 2b245217bce..7bcbc5d7a23 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -352,13 +352,6 @@ inline void setup_table_map(TABLE *table, TABLE_LIST *table_list, uint tablenr) table->force_index= table_list->force_index; table->force_index_order= table->force_index_group= 0; table->covering_keys= table->s->keys_for_keyread; - TABLE_LIST *orig= table_list->select_lex ? - table_list->select_lex->master_unit()->derived : 0; - if (!orig || !orig->is_merged_derived()) - { - /* Tables merged from derived were set up already.*/ - table->covering_keys= table->s->keys_for_keyread; - } } inline TABLE_LIST *find_table_in_global_list(TABLE_LIST *table, |