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

cleanup: remove table_options and corresponding accessor function

Browse Source 
The variable is never used and only takes up SELECT_LEX space.
This commit is contained in:
Vicențiu Ciorbaru
2021-03-07 13:00:21 +02:00
parent 5e72099b83
commit d624464b50
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_lex.cc
View File

@@ -3000,7 +3000,6 @@ void st_select_lex::init_select()
type= 0; type= 0;
db= null_clex_str; db= null_clex_str;
having= 0; having= 0;
table_join_options= 0;
in_sum_expr= with_wild= 0; in_sum_expr= with_wild= 0;
options= 0; options= 0;
ftfunc_list_alloc.empty(); ftfunc_list_alloc.empty();
@@ -3532,12 +3531,6 @@ List<Item>* st_select_lex::get_item_list()
return &item_list; return &item_list;
} }
ulong st_select_lex::get_table_join_options()
{
return table_join_options;
}
bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num)
{ {

1
sql/sql_lex.h
View File

@@ -1232,7 +1232,6 @@ public:
enum_parsing_place context_analysis_place; /* where we are in prepare */ enum_parsing_place context_analysis_place; /* where we are in prepare */
bool with_sum_func; /* sum function indicator */ bool with_sum_func; /* sum function indicator */
ulong table_join_options;
uint in_sum_expr; uint in_sum_expr;
uint select_number; /* number of select (used for EXPLAIN) */ uint select_number; /* number of select (used for EXPLAIN) */

8
sql/sql_yacc.yy
View File

@@ -11969,10 +11969,8 @@ table_primary_ident:
table_ident opt_use_partition opt_for_system_time_clause table_ident opt_use_partition opt_for_system_time_clause
opt_table_alias_clause opt_key_definition opt_table_alias_clause opt_key_definition
{ {
SELECT_LEX *sel= Select;
sel->table_join_options= 0;
if (!($$= Select->add_table_to_list(thd, $1, $4, if (!($$= Select->add_table_to_list(thd, $1, $4,
Select->get_table_join_options(), 0,
YYPS->m_lock_type, YYPS->m_lock_type,
YYPS->m_mdl_type, YYPS->m_mdl_type,
Select->pop_index_hints(), Select->pop_index_hints(),
@@ -13349,10 +13347,8 @@ update_table_list:
table_ident opt_use_partition for_portion_of_time_clause table_ident opt_use_partition for_portion_of_time_clause
opt_table_alias_clause opt_key_definition opt_table_alias_clause opt_key_definition
{ {
SELECT_LEX *sel= Select;
sel->table_join_options= 0;
if (!($$= Select->add_table_to_list(thd, $1, $4, if (!($$= Select->add_table_to_list(thd, $1, $4,
Select->get_table_join_options(), 0,
YYPS->m_lock_type, YYPS->m_lock_type,
YYPS->m_mdl_type, YYPS->m_mdl_type,
Select->pop_index_hints(), Select->pop_index_hints(),