1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

de-virtualize redundantly virtual Item method

Browse Source 
and remove a couple of useless MY_TEST's
This commit is contained in:
Sergei Golubchik 2020-09-08 18:54:56 +02:00
parent d2bf1ed030
commit 5ad36aa3b8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item.h
View File

@ -2392,7 +2392,7 @@ public:
if (join_tab_idx_arg < join_tab_idx) if (join_tab_idx_arg < join_tab_idx)
join_tab_idx= join_tab_idx_arg; join_tab_idx= join_tab_idx_arg;
} }
virtual uint get_join_tab_idx() { return join_tab_idx; } uint get_join_tab_idx() const { return join_tab_idx; }
table_map view_used_tables(TABLE_LIST *view) table_map view_used_tables(TABLE_LIST *view)
{ {

4
sql/opt_index_cond_pushdown.cc
View File

@ -206,7 +206,7 @@ static Item *make_cond_for_index(THD *thd, Item *cond, TABLE *table, uint keyno,
new_cond->argument_list()->push_back(fix, thd->mem_root); new_cond->argument_list()->push_back(fix, thd->mem_root);
used_tables|= fix->used_tables(); used_tables|= fix->used_tables();
} }
if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY)) if (item->marker == ICP_COND_USES_INDEX_ONLY)
{ {
n_marked++; n_marked++;
item->marker= 0; item->marker= 0;
@ -239,7 +239,7 @@ static Item *make_cond_for_index(THD *thd, Item *cond, TABLE *table, uint keyno,
if (!fix) if (!fix)
return (COND*) 0; return (COND*) 0;
new_cond->argument_list()->push_back(fix, thd->mem_root); new_cond->argument_list()->push_back(fix, thd->mem_root);
if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY)) if (item->marker == ICP_COND_USES_INDEX_ONLY)
{ {
n_marked++; n_marked++;
item->marker= 0; item->marker= 0;