diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-01-13 17:37:19 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-01-13 17:38:31 +0200 |
| commit | f27a9824f7ba8bddb6da2f311445b0e6b6476845 (patch) | |
| tree | 27be8d0e4c0f3f5b8110dadd2e2aece6f6063fcd | |
| parent | 4877e0db59756192552cc5585ba194f2588657e9 (diff) | |
| download | mariadb-git-f27a9824f7ba8bddb6da2f311445b0e6b6476845.tar.gz | |
Cleanup
Remove unneded get_table_join_options. The variable was always passed as
0.
| -rw-r--r-- | sql/sql_lex.cc | 7 | ||||
| -rw-r--r-- | sql/sql_lex.h | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
3 files changed, 2 insertions, 14 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 57405cd6d84..4b05ee32db3 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2996,7 +2996,6 @@ void st_select_lex::init_select() type= 0; db= null_clex_str; having= 0; - table_join_options= 0; in_sum_expr= with_wild= 0; options= 0; ftfunc_list_alloc.empty(); @@ -3496,12 +3495,6 @@ List<Item>* st_select_lex::get_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) { diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 7606d4e09c2..f0f1d641a1d 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1230,7 +1230,6 @@ public: enum_parsing_place context_analysis_place; /* where we are in prepare */ bool with_sum_func; /* sum function indicator */ - ulong table_join_options; uint in_sum_expr; uint select_number; /* number of select (used for EXPLAIN) */ diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ff3ac39446e..21dc8ae3bee 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -11713,10 +11713,8 @@ table_primary_ident: table_ident opt_use_partition opt_for_system_time_clause 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, - Select->get_table_join_options(), + 0, YYPS->m_lock_type, YYPS->m_mdl_type, Select->pop_index_hints(), @@ -13177,10 +13175,8 @@ update_table_list: table_ident opt_use_partition for_portion_of_time_clause 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, - Select->get_table_join_options(), + 0, YYPS->m_lock_type, YYPS->m_mdl_type, Select->pop_index_hints(), |