diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 539152de73d..ca7732316c7 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -3000,7 +3000,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();
@@ -3532,12 +3531,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 b9bc108c419..b531963c381 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1232,7 +1232,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 a330ed328a4..fa8be38e7a2 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -11969,10 +11969,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(),
@@ -13349,10 +13347,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(),