database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

cleanup: remove now-unused TABLE::merge_keys

Browse Source
This commit is contained in:
Sergei Golubchik
2016-11-16 14:04:49 +01:00
parent b38ff28ade
commit 54ab7db733
7 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.h
View File

@ -329,14 +329,12 @@ 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->merge_keys.clear_all();
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;
table->merge_keys.clear_all();
}
}